Adds proxy_url to v1.Endpoint. Fixes #1385

Documentation/api.md

@@ -157,6 +157,7 @@ Endpoint defines a scrapeable endpoint serving Prometheus metrics.
 | honorLabels | HonorLabels chooses the metric's labels on collisions with target labels. | bool | false |
 | basicAuth | BasicAuth allow an endpoint to authenticate over basic authentication More info: https://prometheus.io/docs/operating/configuration/#endpoints | *[BasicAuth](#basicauth) | false |
 | metricRelabelings | MetricRelabelConfigs to apply to samples before ingestion. | []*[RelabelConfig](#relabelconfig) | false |
+| proxyUrl | ProxyURL eg http://proxyserver:2195 Directs scrapes to proxy through this endpoint. | *string | false |
 
 [Back to TOC](#table-of-contents)
 

contrib/kube-prometheus/manifests/0prometheus-operator-0servicemonitorCustomResourceDefinition.yaml

@@ -133,6 +133,10 @@ spec:
                     description: Name of the service port this endpoint refers to.
                       Mutually exclusive with targetPort.
                     type: string
+                  proxyUrl:
+                    description: ProxyURL eg http://proxyserver:2195 Directs scrapes
+                      to proxy through this endpoint.
+                    type: string
                   scheme:
                     description: HTTP scheme to use for scraping.
                     type: string

contrib/kube-prometheus/manifests/grafana-dashboardDefinitions.yaml

@@ -3868,7 +3868,7 @@ data:
                         "steppedLine": false,
                         "targets": [
                             {
-                                "expr": "sum(irate(container_cpu_usage_seconds_total{namespace=\"$namespace\",pod_name=\"$pod\"}[1m])) by (container_name)",
+                                "expr": "sum(irate(container_cpu_usage_seconds_total{namespace=\"$namespace\", pod_name=\"$pod\", container_name!=\"POD\"}[1m])) by (container_name)",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "{{container_name}}",
@@ -4097,7 +4097,7 @@ data:
                         ],
                         "targets": [
                             {
-                                "expr": "sum(label_replace(rate(container_cpu_usage_seconds_total{namespace=\"$namespace\", pod_name=\"$pod\"}[5m]), \"container\", \"$1\", \"container_name\", \"(.*)\")) by (container)",
+                                "expr": "sum(label_replace(rate(container_cpu_usage_seconds_total{namespace=\"$namespace\", pod_name=\"$pod\", container_name!=\"POD\"}[5m]), \"container\", \"$1\", \"container_name\", \"(.*)\")) by (container)",
                                 "format": "table",
                                 "instant": true,
                                 "intervalFactor": 2,
@@ -4228,7 +4228,7 @@ data:
                         "steppedLine": false,
                         "targets": [
                             {
-                                "expr": "sum(container_memory_usage_bytes{namespace=\"$namespace\", pod_name=\"$pod\"}) by (container_name)",
+                                "expr": "sum(container_memory_usage_bytes{namespace=\"$namespace\", pod_name=\"$pod\", container_name!=\"POD\"}) by (container_name)",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "{{container_name}}",
@@ -4457,7 +4457,7 @@ data:
                         ],
                         "targets": [
                             {
-                                "expr": "sum(label_replace(container_memory_usage_bytes{namespace=\"$namespace\", pod_name=\"$pod\"}, \"container\", \"$1\", \"container_name\", \"(.*)\")) by (container)",
+                                "expr": "sum(label_replace(container_memory_usage_bytes{namespace=\"$namespace\", pod_name=\"$pod\", container_name!=\"POD\"}, \"container\", \"$1\", \"container_name\", \"(.*)\")) by (container)",
                                 "format": "table",
                                 "instant": true,
                                 "intervalFactor": 2,
@@ -5003,7 +5003,7 @@ data:
                             "rgba(237, 129, 40, 0.89)",
                             "rgba(245, 54, 54, 0.9)"
                         ],
-                        "datasource": "prometheus",
+                        "datasource": "$datasource",
                         "format": "percent",
                         "gauge": {
                             "maxValue": 100,
@@ -5206,7 +5206,7 @@ data:
                             "rgba(237, 129, 40, 0.89)",
                             "rgba(245, 54, 54, 0.9)"
                         ],
-                        "datasource": "prometheus",
+                        "datasource": "$datasource",
                         "format": "percent",
                         "gauge": {
                             "maxValue": 100,
@@ -6066,7 +6066,7 @@ data:
                             "rgba(237, 129, 40, 0.89)",
                             "#d44a3a"
                         ],
-                        "datasource": "prometheus",
+                        "datasource": "$datasource",
                         "format": "none",
                         "gauge": {
                             "maxValue": 100,
@@ -6145,7 +6145,7 @@ data:
                             "rgba(237, 129, 40, 0.89)",
                             "#d44a3a"
                         ],
-                        "datasource": "prometheus",
+                        "datasource": "$datasource",
                         "format": "none",
                         "gauge": {
                             "maxValue": 100,
@@ -6224,7 +6224,7 @@ data:
                             "rgba(237, 129, 40, 0.89)",
                             "#d44a3a"
                         ],
-                        "datasource": "prometheus",
+                        "datasource": "$datasource",
                         "format": "none",
                         "gauge": {
                             "maxValue": 100,
@@ -6317,7 +6317,7 @@ data:
                             "rgba(237, 129, 40, 0.89)",
                             "#d44a3a"
                         ],
-                        "datasource": "prometheus",
+                        "datasource": "$datasource",
                         "format": "none",
                         "gauge": {
                             "maxValue": 100,
@@ -6397,7 +6397,7 @@ data:
                             "rgba(237, 129, 40, 0.89)",
                             "#d44a3a"
                         ],
-                        "datasource": "prometheus",
+                        "datasource": "$datasource",
                         "format": "none",
                         "gauge": {
                             "maxValue": 100,
@@ -6477,7 +6477,7 @@ data:
                             "rgba(237, 129, 40, 0.89)",
                             "#d44a3a"
                         ],
-                        "datasource": "prometheus",
+                        "datasource": "$datasource",
                         "format": "none",
                         "gauge": {
                             "maxValue": 100,
@@ -6557,7 +6557,7 @@ data:
                             "rgba(237, 129, 40, 0.89)",
                             "#d44a3a"
                         ],
-                        "datasource": "prometheus",
+                        "datasource": "$datasource",
                         "format": "none",
                         "gauge": {
                             "maxValue": 100,

example/prometheus-operator-crd/servicemonitor.crd.yaml

@@ -134,6 +134,10 @@ spec:
                     description: Name of the service port this endpoint refers to.
                       Mutually exclusive with targetPort.
                     type: string
+                  proxyUrl:
+                    description: ProxyURL eg http://proxyserver:2195 Directs scrapes
+                      to proxy through this endpoint.
+                    type: string
                   scheme:
                     description: HTTP scheme to use for scraping.
                     type: string

pkg/client/monitoring/v1/openapi_generated.go

@@ -541,6 +541,13 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
 								},
 							},
 						},
+						"proxyUrl": {
+							SchemaProps: spec.SchemaProps{
+								Description: "ProxyURL eg http://proxyserver:2195 Directs scrapes to proxy through this endpoint.",
+								Type:        []string{"string"},
+								Format:      "",
+							},
+						},
 					},
 				},
 			},

pkg/client/monitoring/v1/types.go

@@ -367,6 +367,8 @@ type Endpoint struct {
 	BasicAuth *BasicAuth `json:"basicAuth,omitempty"`
 	// MetricRelabelConfigs to apply to samples before ingestion.
 	MetricRelabelConfigs []*RelabelConfig `json:"metricRelabelings,omitempty"`
+	// ProxyURL eg http://proxyserver:2195 Directs scrapes to proxy through this endpoint.
+	ProxyURL *string `json:"proxyUrl,omitempty"`
 }
 
 // BasicAuth allow an endpoint to authenticate over basic authentication

pkg/client/monitoring/v1/zz_generated.deepcopy.go

@@ -334,6 +334,15 @@ func (in *Endpoint) DeepCopyInto(out *Endpoint) {
 			}
 		}
 	}
+	if in.ProxyURL != nil {
+		in, out := &in.ProxyURL, &out.ProxyURL
+		if *in == nil {
+			*out = nil
+		} else {
+			*out = new(string)
+			**out = **in
+		}
+	}
 	return
 }
 

pkg/client/monitoring/v1alpha1/types.go

@@ -216,6 +216,8 @@ type Endpoint struct {
 	// BasicAuth allow an endpoint to authenticate over basic authentication
 	// More info: https://prometheus.io/docs/operating/configuration/#endpoints
 	BasicAuth *BasicAuth `json:"basicAuth,omitempty"`
+	// ProxyURL eg http://proxyserver:2195 Directs scrapes to proxy through this endpoint.
+	ProxyURL *string `json:"proxyUrl,omitempty"`
 }
 
 // BasicAuth allow an endpoint to authenticate over basic authentication

pkg/prometheus/promcfg.go

@@ -233,6 +233,9 @@ func generateServiceMonitorConfig(version semver.Version, m *v1.ServiceMonitor,
 	if ep.Path != "" {
 		cfg = append(cfg, yaml.MapItem{Key: "metrics_path", Value: ep.Path})
 	}
+	if ep.ProxyURL != nil {
+		cfg = append(cfg, yaml.MapItem{Key: "proxy_url", Value: ep.ProxyURL})
+	}
 	if ep.Params != nil {
 		cfg = append(cfg, yaml.MapItem{Key: "params", Value: ep.Params})
 	}