Merge pull request prometheus-operator#1330 from prometheus-operator/automated-updates-main

dgrisonnet · web-flow · commit c69f3b4e6234 · 2021-08-17T10:18:47.000+02:00
[bot] [main] Automated version update
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
           "subdir": "contrib/mixin"
         }
       },
-      "version": "ea24fb850762ce38155738aff5ae71368eadb904",
+      "version": "ab9563dc8e4d84d06080c765f9c6c0d50313f794",
       "sum": "5XhYOigrKipOWDbIn9hlrz7JcbelzvJnormxSaup9JI="
     },
     {
@@ -38,7 +38,7 @@
           "subdir": "grafana-builder"
         }
       },
-      "version": "e0c0f8caf0296138f7a74f1af5e9964339881788",
+      "version": "0d13e5ba1b3a4c29015738c203d92ea39f71ebe2",
       "sum": "GRf2GvwEU4jhXV+JOonXSZ4wdDv8mnHBPCQ6TUVd+g8="
     },
     {
@@ -48,8 +48,8 @@
           "subdir": ""
         }
       },
-      "version": "9adde6c4eef082ad05b46124d780f42d6b19b896",
-      "sum": "y8BjnZprY4KvjPJhLXtTf6MyE6EKFzGjCvxuwc/Ucv8="
+      "version": "7120319a5b5c45e8dd2e79f0ad60e2284c6d6f1b",
+      "sum": "SDq4RWF3EKhMI/+/rZfG75Oh7hcXVmGNZ7kM0D21s6M="
     },
     {
       "source": {
@@ -58,7 +58,7 @@
           "subdir": "lib/promgrafonnet"
         }
       },
-      "version": "9adde6c4eef082ad05b46124d780f42d6b19b896",
+      "version": "7120319a5b5c45e8dd2e79f0ad60e2284c6d6f1b",
       "sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
     },
     {
@@ -88,7 +88,7 @@
           "subdir": "jsonnet/mixin"
         }
       },
-      "version": "7649bb8d5c1c0a8900e804dbef44c10057fa7c96",
+      "version": "805d4ff2f5486081757f51bbd6e6d96e54b9148e",
       "sum": "6reUygVmQrLEWQzTKcH8ceDbvM+2ztK3z2VBR2K2l+U=",
       "name": "prometheus-operator-mixin"
     },
@@ -99,8 +99,8 @@
           "subdir": "jsonnet/prometheus-operator"
         }
       },
-      "version": "7649bb8d5c1c0a8900e804dbef44c10057fa7c96",
-      "sum": "dIYX9ERZvBUcPNcIVwgdWHnc5BDlAlTocAAdyuqu2ig="
+      "version": "805d4ff2f5486081757f51bbd6e6d96e54b9148e",
+      "sum": "J1G++A8hrtr3+OZQMmcNeb1w/C30bXqqwpwHL/Xhsd4="
     },
     {
       "source": {
@@ -120,8 +120,8 @@
           "subdir": "docs/node-mixin"
         }
       },
-      "version": "4356c09ebd2d6c6056855cbb6bc51f34235ad919",
-      "sum": "vvgImniWcZVtiU3rEQmeN4DaIktPXNn7u3Zqzdv5bMg="
+      "version": "832909dd257eb368cf83363ffcae3ab84cb4bcb1",
+      "sum": "MmxGhE2PJ1a52mk2x7vDpMT2at4Jglbud/rK74CB5i0="
     },
     {
       "source": {
@@ -141,7 +141,7 @@
           "subdir": "mixin"
         }
       },
-      "version": "79d9480728052d698691f5e18c032c8332c6656e",
+      "version": "7a8d1894e80038f783a6396312051c7d62d25d35",
       "sum": "cajthvLKDjYgYHCKQU2g/pTMRkxcbuJEvTnCyJOihl8=",
       "name": "thanos-mixin"
     },
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
@@ -4149,7 +4149,7 @@ items:
                       "options": [
 
                       ],
-                      "query": "label_values(kube_pod_info, cluster)",
+                      "query": "label_values(up{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\"}, cluster)",
                       "refresh": 2,
                       "regex": "",
                       "sort": 0,
@@ -5289,7 +5289,7 @@ items:
                       "options": [
 
                       ],
-                      "query": "label_values(kube_pod_info, cluster)",
+                      "query": "label_values(up{job=\"kube-controller-manager\"}, cluster)",
                       "refresh": 2,
                       "regex": "",
                       "sort": 1,
@@ -5315,7 +5315,7 @@ items:
                       "options": [
 
                       ],
-                      "query": "label_values(process_cpu_seconds_total{cluster=\"$cluster\", job=\"kube-controller-manager\"}, instance)",
+                      "query": "label_values(up{cluster=\"$cluster\", job=\"kube-controller-manager\"}, instance)",
                       "refresh": 2,
                       "regex": "",
                       "sort": 1,
@@ -8328,7 +8328,7 @@ items:
                       "options": [
 
                       ],
-                      "query": "label_values(node_cpu_seconds_total, cluster)",
+                      "query": "label_values(up{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\"}, cluster)",
                       "refresh": 2,
                       "regex": "",
                       "sort": 1,
@@ -20770,7 +20770,7 @@ items:
                       "options": [
 
                       ],
-                      "query": "label_values(kube_pod_info, cluster)",
+                      "query": "label_values(up{job=\"kubelet\", metrics_path=\"/metrics\"}, cluster)",
                       "refresh": 2,
                       "regex": "",
                       "sort": 1,
@@ -22137,7 +22137,7 @@ items:
                       "options": [
 
                       ],
-                      "query": "label_values(kube_pod_info, cluster)",
+                      "query": "label_values(up{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\"}, cluster)",
                       "refresh": 2,
                       "regex": "",
                       "sort": 0,
@@ -23830,7 +23830,7 @@ items:
                       "options": [
 
                       ],
-                      "query": "label_values(kube_pod_info, cluster)",
+                      "query": "label_values(up{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\"}, cluster)",
                       "refresh": 2,
                       "regex": "",
                       "sort": 0,
@@ -28723,7 +28723,7 @@ items:
                       "options": [
 
                       ],
-                      "query": "label_values(kube_pod_info, cluster)",
+                      "query": "label_values(up{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\"}, cluster)",
                       "refresh": 2,
                       "regex": "",
                       "sort": 0,
@@ -34059,7 +34059,7 @@ items:
                       "options": [
 
                       ],
-                      "query": "label_values(kube_pod_info, cluster)",
+                      "query": "label_values(up{job=\"kube-scheduler\"}, cluster)",
                       "refresh": 2,
                       "regex": "",
                       "sort": 1,
diff --git a/manifests/node-exporter-prometheusRule.yaml b/manifests/node-exporter-prometheusRule.yaml
@@ -57,7 +57,7 @@ spec:
         and
           node_filesystem_readonly{job="node-exporter",fstype!=""} == 0
         )
-      for: 1h
+      for: 30m
       labels:
         severity: warning
     - alert: NodeFilesystemAlmostOutOfSpace
@@ -71,7 +71,7 @@ spec:
         and
           node_filesystem_readonly{job="node-exporter",fstype!=""} == 0
         )
-      for: 1h
+      for: 30m
       labels:
         severity: critical
     - alert: NodeFilesystemFilesFillingUp
diff --git a/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
@@ -2946,6 +2946,9 @@ spec:
                     remoteTimeout:
                       description: Timeout for requests to the remote write endpoint.
                       type: string
+                    sendExemplars:
+                      description: Enables sending of exemplars over remote write. Note that exemplar-storage itself must be enabled using the enableFeature option for exemplars to be scraped in the first place.  Only valid in Prometheus versions 2.27.0 and newer.
+                      type: boolean
                     tlsConfig:
                       description: TLS Config to use for remote write.
                       properties:
diff --git a/manifests/setup/prometheus-operator-0prometheusruleCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0prometheusruleCustomResourceDefinition.yaml
@@ -8,6 +8,8 @@ metadata:
 spec:
   group: monitoring.coreos.com
   names:
+    categories:
+    - prometheus-operator
     kind: PrometheusRule
     listKind: PrometheusRuleList
     plural: prometheusrules

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`"subdir": "contrib/mixin"`
`19`	`19`	`}`
`20`	`20`	`},`
`21`		`- "version": "ea24fb850762ce38155738aff5ae71368eadb904",`
	`21`	`+ "version": "ab9563dc8e4d84d06080c765f9c6c0d50313f794",`
`22`	`22`	`"sum": "5XhYOigrKipOWDbIn9hlrz7JcbelzvJnormxSaup9JI="`
`23`	`23`	`},`
`24`	`24`	`{`
`@@ -38,7 +38,7 @@`
`38`	`38`	`"subdir": "grafana-builder"`
`39`	`39`	`}`
`40`	`40`	`},`
`41`		`- "version": "e0c0f8caf0296138f7a74f1af5e9964339881788",`
	`41`	`+ "version": "0d13e5ba1b3a4c29015738c203d92ea39f71ebe2",`
`42`	`42`	`"sum": "GRf2GvwEU4jhXV+JOonXSZ4wdDv8mnHBPCQ6TUVd+g8="`
`43`	`43`	`},`
`44`	`44`	`{`
`@@ -48,8 +48,8 @@`
`48`	`48`	`"subdir": ""`
`49`	`49`	`}`
`50`	`50`	`},`
`51`		`- "version": "9adde6c4eef082ad05b46124d780f42d6b19b896",`
`52`		`- "sum": "y8BjnZprY4KvjPJhLXtTf6MyE6EKFzGjCvxuwc/Ucv8="`
	`51`	`+ "version": "7120319a5b5c45e8dd2e79f0ad60e2284c6d6f1b",`
	`52`	`+ "sum": "SDq4RWF3EKhMI/+/rZfG75Oh7hcXVmGNZ7kM0D21s6M="`
`53`	`53`	`},`
`54`	`54`	`{`
`55`	`55`	`"source": {`
`@@ -58,7 +58,7 @@`
`58`	`58`	`"subdir": "lib/promgrafonnet"`
`59`	`59`	`}`
`60`	`60`	`},`
`61`		`- "version": "9adde6c4eef082ad05b46124d780f42d6b19b896",`
	`61`	`+ "version": "7120319a5b5c45e8dd2e79f0ad60e2284c6d6f1b",`
`62`	`62`	`"sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="`
`63`	`63`	`},`
`64`	`64`	`{`
`@@ -88,7 +88,7 @@`
`88`	`88`	`"subdir": "jsonnet/mixin"`
`89`	`89`	`}`
`90`	`90`	`},`
`91`		`- "version": "7649bb8d5c1c0a8900e804dbef44c10057fa7c96",`
	`91`	`+ "version": "805d4ff2f5486081757f51bbd6e6d96e54b9148e",`
`92`	`92`	`"sum": "6reUygVmQrLEWQzTKcH8ceDbvM+2ztK3z2VBR2K2l+U=",`
`93`	`93`	`"name": "prometheus-operator-mixin"`
`94`	`94`	`},`
`@@ -99,8 +99,8 @@`
`99`	`99`	`"subdir": "jsonnet/prometheus-operator"`
`100`	`100`	`}`
`101`	`101`	`},`
`102`		`- "version": "7649bb8d5c1c0a8900e804dbef44c10057fa7c96",`
`103`		`- "sum": "dIYX9ERZvBUcPNcIVwgdWHnc5BDlAlTocAAdyuqu2ig="`
	`102`	`+ "version": "805d4ff2f5486081757f51bbd6e6d96e54b9148e",`
	`103`	`+ "sum": "J1G++A8hrtr3+OZQMmcNeb1w/C30bXqqwpwHL/Xhsd4="`
`104`	`104`	`},`
`105`	`105`	`{`
`106`	`106`	`"source": {`
`@@ -120,8 +120,8 @@`
`120`	`120`	`"subdir": "docs/node-mixin"`
`121`	`121`	`}`
`122`	`122`	`},`
`123`		`- "version": "4356c09ebd2d6c6056855cbb6bc51f34235ad919",`
`124`		`- "sum": "vvgImniWcZVtiU3rEQmeN4DaIktPXNn7u3Zqzdv5bMg="`
	`123`	`+ "version": "832909dd257eb368cf83363ffcae3ab84cb4bcb1",`
	`124`	`+ "sum": "MmxGhE2PJ1a52mk2x7vDpMT2at4Jglbud/rK74CB5i0="`
`125`	`125`	`},`
`126`	`126`	`{`
`127`	`127`	`"source": {`
`@@ -141,7 +141,7 @@`
`141`	`141`	`"subdir": "mixin"`
`142`	`142`	`}`
`143`	`143`	`},`
`144`		`- "version": "79d9480728052d698691f5e18c032c8332c6656e",`
	`144`	`+ "version": "7a8d1894e80038f783a6396312051c7d62d25d35",`
`145`	`145`	`"sum": "cajthvLKDjYgYHCKQU2g/pTMRkxcbuJEvTnCyJOihl8=",`
`146`	`146`	`"name": "thanos-mixin"`
`147`	`147`	`},`