mirrors/kube-prometheus
1
0
Fork 0
mirror of https://github.com/prometheus-operator/kube-prometheus.git synced 2025-10-24 05:31:00 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1491 from paulfantom/master-to-main

Browse Source
This commit is contained in:
Paweł Krupa 2021-11-09 15:41:59 +01:00 committed by GitHub
commit 6727dc31a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jsonnet/kube-prometheus/jsonnetfile.json
View File

@ -26,7 +26,7 @@
"subdir": "jsonnet/prometheus-operator" "subdir": "jsonnet/prometheus-operator"
} }
}, },
"version": "master" "version": "main"
}, },
{ {
"source": { "source": {
@ -35,7 +35,7 @@
"subdir": "jsonnet/mixin" "subdir": "jsonnet/mixin"
} }
}, },
"version": "master", "version": "main",
"name": "prometheus-operator-mixin" "name": "prometheus-operator-mixin"
}, },
{ {

18
jsonnetfile.lock.json
View File

@ -38,7 +38,7 @@
"subdir": "grafana-builder" "subdir": "grafana-builder"
} }
}, },
"version": "4aa4f22106408806a9fbd8452bd02b47af3974aa", "version": "488418661ae974de085d858d4b5f91d9ae25a91b",
"sum": "U34Nd1ViO2LZ3D8IzygPPRfUcy6zOgCnTMVHZ+9O/QE=" "sum": "U34Nd1ViO2LZ3D8IzygPPRfUcy6zOgCnTMVHZ+9O/QE="
}, },
{ {
@ -48,8 +48,8 @@
"subdir": "" "subdir": ""
} }
}, },
"version": "c099e4e92adfce9652f96bea79c43f0d71243669", "version": "53d2bb3899bd249a16d81175d4f298361beb359b",
"sum": "eSfm4Fbr4kmw1cHnCBWfeNzEvWwROdedwtRYD/Ha7Cc=" "sum": "U3X88YoEavKFnoLPWA9Pw8+qauiAEaWMnJDo+TAa1hQ="
}, },
{ {
"source": { "source": {
@ -58,7 +58,7 @@
"subdir": "lib/promgrafonnet" "subdir": "lib/promgrafonnet"
} }
}, },
"version": "c099e4e92adfce9652f96bea79c43f0d71243669", "version": "53d2bb3899bd249a16d81175d4f298361beb359b",
"sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps=" "sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
}, },
{ {
@ -88,7 +88,7 @@
"subdir": "jsonnet/mixin" "subdir": "jsonnet/mixin"
} }
}, },
"version": "0c462338af16a28fefd75db72a0df281652f4f3a", "version": "d866500b016256147c0933c59cbc22e08e7cf680",
"sum": "qZ4WgiweaE6eeKtFK60QUjLO8sf2L9Q8fgafWvDcyfY=", "sum": "qZ4WgiweaE6eeKtFK60QUjLO8sf2L9Q8fgafWvDcyfY=",
"name": "prometheus-operator-mixin" "name": "prometheus-operator-mixin"
}, },
@ -99,7 +99,7 @@
"subdir": "jsonnet/prometheus-operator" "subdir": "jsonnet/prometheus-operator"
} }
}, },
"version": "0c462338af16a28fefd75db72a0df281652f4f3a", "version": "d866500b016256147c0933c59cbc22e08e7cf680",
"sum": "wGhH4SZ/ua5ydqEPKs4eDRRnVNvPs1C+Qt9yZmy9RQ8=" "sum": "wGhH4SZ/ua5ydqEPKs4eDRRnVNvPs1C+Qt9yZmy9RQ8="
}, },
{ {
@ -109,7 +109,7 @@
"subdir": "doc/alertmanager-mixin" "subdir": "doc/alertmanager-mixin"
} }
}, },
"version": "b7035556e8add131076bc9f5c4fe075c74d0495c", "version": "5b825e22a4645840f7074a8f97e9ff809ea1f076",
"sum": "pep+dHzfIjh2SU5pEkwilMCAT/NoL6YYflV4x8cr7vU=", "sum": "pep+dHzfIjh2SU5pEkwilMCAT/NoL6YYflV4x8cr7vU=",
"name": "alertmanager" "name": "alertmanager"
}, },
@ -130,7 +130,7 @@
"subdir": "documentation/prometheus-mixin" "subdir": "documentation/prometheus-mixin"
} }
}, },
"version": "cda025b5b50328ccd129c141e09dd77b3b1b034e", "version": "4c56a193c518ae6f56008b0a4c850a9c3f1477c6",
"sum": "n5Zdr/7YeRb8Y9FsXnul5K+hprHOzuSXsYdkapEhPts=", "sum": "n5Zdr/7YeRb8Y9FsXnul5K+hprHOzuSXsYdkapEhPts=",
"name": "prometheus" "name": "prometheus"
}, },
@ -141,7 +141,7 @@
"subdir": "mixin" "subdir": "mixin"
} }
}, },
"version": "102d294fc060403ba8086fdada1219999380aa4c", "version": "0ef2fda61c714c3aa451a348d23db2dd2806e2e6",
"sum": "Og+wEHfgzXBvBLAeeQvGNoiCw3FY4LQHlJdpsG/owj8=", "sum": "Og+wEHfgzXBvBLAeeQvGNoiCw3FY4LQHlJdpsG/owj8=",
"name": "thanos-mixin" "name": "thanos-mixin"
}, },

2
manifests/grafana-dashboardDefinitions.yaml
View File

@ -12028,7 +12028,7 @@ items:
"options": [ "options": [
], ],
"query": "label_values(up{job=\"kube-state-metrics\", cluster=\"$cluster\"}, node)", "query": "label_values(kube_node_info{cluster=\"$cluster\"}, node)",
"refresh": 2, "refresh": 2,
"regex": "", "regex": "",
"sort": 1, "sort": 1,