From b213437fb6976ad07a23218f64398babcda04446 Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Mon, 27 Aug 2018 14:07:15 -0600
Subject: [PATCH] kube-prometheus: Update jsonnet dependencies
---
jsonnetfile.lock.json | 10 +-
.../0prometheus-operator-deployment.yaml | 4 +-
manifests/grafana-dashboardDefinitions.yaml | 155 +++++++++---------
3 files changed, 83 insertions(+), 86 deletions(-)
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 8f790443..5f6e091a 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -8,7 +8,7 @@
"subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
}
},
- "version": "43d93161ee1d5215a25e6a35582605cf2f4c26dd"
+ "version": "66226d27f1fca6096c420b46b097b9e2475189e6"
},
{
"name": "ksonnet",
@@ -28,7 +28,7 @@
"subdir": ""
}
},
- "version": "a2b417a9aa27d508d1c0b730ace0dff20b3b7bf7"
+ "version": "4090e091fee875fd2baec1531a7ef9c2ab58c99b"
},
{
"name": "grafonnet",
@@ -38,7 +38,7 @@
"subdir": "grafonnet"
}
},
- "version": "0fdef020a6360415d2c8fdc82b29122583e4df05"
+ "version": "d21784739a9adc7992c0382d1efa42be4ddb3044"
},
{
"name": "grafana-builder",
@@ -68,7 +68,7 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "ba92b2f232ef24684b9dc6bde03b74e1630909a6"
+ "version": "27b1eb72d9d93e5ab447121e2b884bc558bde01d"
},
{
"name": "etcd-mixin",
@@ -78,7 +78,7 @@
"subdir": "Documentation/etcd-mixin"
}
},
- "version": "bdc333359b618b7519660ead7a4ef30288f8d350"
+ "version": "af85949b416547ed0989b396a28fe77f65978828"
}
]
}
\ No newline at end of file
diff --git a/manifests/0prometheus-operator-deployment.yaml b/manifests/0prometheus-operator-deployment.yaml
index 052511f4..6894d92c 100644
--- a/manifests/0prometheus-operator-deployment.yaml
+++ b/manifests/0prometheus-operator-deployment.yaml
@@ -20,8 +20,8 @@ spec:
- --kubelet-service=kube-system/kubelet
- --logtostderr=true
- --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
- - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.23.1
- image: quay.io/coreos/prometheus-operator:v0.23.1
+ - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.23.2
+ image: quay.io/coreos/prometheus-operator:v0.23.2
name: prometheus-operator
ports:
- containerPort: 8080
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index db2d0939..551647b8 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -796,7 +796,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "sum(max(node_filesystem_size{fstype=\u007e\"ext[24]\"} - node_filesystem_avail{fstype=\u007e\"ext[24]\"}) by (device,pod,namespace)) by (pod,namespace) / scalar(sum(max(node_filesystem_size{fstype=\u007e\"ext[24]\"}) by (device,pod,namespace))) * on (namespace, pod) group_left(node) node_namespace_pod:kube_pod_info:\n",
+ "expr": "sum(max(node_filesystem_size{fstype=\u007e\"ext[234]|btrfs|xfs|zfs\"} - node_filesystem_avail{fstype=\u007e\"ext[234]|btrfs|xfs|zfs\"}) by (device,pod,namespace)) by (pod,namespace)\n/ scalar(sum(max(node_filesystem_size{fstype=\u007e\"ext[234]|btrfs|xfs|zfs\"}) by (device,pod,namespace)))\n* on (namespace, pod) group_left (node) node_namespace_pod:kube_pod_info:\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{node}}",
@@ -1712,10 +1712,10 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "1 - sum(max by (device, node) (node_filesystem_avail{fstype=\u007e\"ext[24]\"})) / sum(max by (device, node) (node_filesystem_size{fstype=\u007e\"ext[24]\"}))",
+ "expr": "max ((node_filesystem_size{fstype=\u007e\"ext[234]|btrfs|xfs|zfs\"} - node_filesystem_avail{fstype=\u007e\"ext[234]|btrfs|xfs|zfs\"})\n/ node_filesystem_size{fstype=\u007e\"ext[234]|btrfs|xfs|zfs\"}) by (namespace, pod, device)\n* on (namespace, pod) group_left (node) node_namespace_pod:kube_pod_info:{node=\"$node\"}\n",
"format": "time_series",
"intervalFactor": 2,
- "legendFormat": "Disk",
+ "legendFormat": "{{device}}",
"legendLink": null,
"step": 10
}
@@ -4914,7 +4914,6 @@ items:
{
"collapse": false,
"collapsed": false,
- "height": "250px",
"panels": [
{
"aliasColors": {
@@ -5124,7 +5123,6 @@ items:
{
"collapse": false,
"collapsed": false,
- "height": "250px",
"panels": [
{
"aliasColors": {
@@ -5165,7 +5163,7 @@ items:
],
"spaceLength": 10,
- "span": 6,
+ "span": 9,
"stack": false,
"steppedLine": false,
"targets": [
@@ -5309,7 +5307,6 @@ items:
{
"collapse": false,
"collapsed": false,
- "height": "250px",
"panels": [
{
"aliasColors": {
@@ -5515,7 +5512,6 @@ items:
{
"collapse": false,
"collapsed": false,
- "height": "250px",
"panels": [
{
"aliasColors": {
@@ -5563,7 +5559,7 @@ items:
}
],
"spaceLength": 10,
- "span": 9,
+ "span": 6,
"stack": false,
"steppedLine": false,
"targets": [
@@ -5630,84 +5626,95 @@ items:
]
},
{
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "rgba(50, 172, 45, 0.97)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(245, 54, 54, 0.9)"
- ],
- "datasource": "$datasource",
- "format": "percent",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": true,
- "thresholdLabels": false,
- "thresholdMarkers": true
+ "aliasColors": {
+
},
+ "bars": false,
+ "dashLength": 10,
+ "dashes": false,
+ "datasource": "$datasource",
+ "fill": 1,
"gridPos": {
},
"id": 9,
- "interval": null,
+ "legend": {
+ "alignAsTable": false,
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "rightSide": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 1,
"links": [
],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
+ "nullPointMode": "null",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "repeat": null,
+ "seriesOverrides": [
+
],
- "span": 3,
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": false,
- "lineColor": "rgb(31, 120, 193)",
- "show": false
- },
- "tableColumn": "",
+ "spaceLength": 10,
+ "span": 6,
+ "stack": false,
+ "steppedLine": false,
"targets": [
{
- "expr": "(\n sum(node_filesystem_size{job=\"node-exporter\", device!=\"rootfs\", instance=\"$instance\"})\n- sum(node_filesystem_avail{job=\"node-exporter\", device!=\"rootfs\", instance=\"$instance\"})\n) * 100\n /\nsum(node_filesystem_size{job=\"node-exporter\", device!=\"rootfs\", instance=\"$instance\"})\n",
+ "expr": "max ((node_filesystem_size{fstype=\u007e\"ext[234]|btrfs|xfs|zfs\",instance=\"$instance\"}\n- node_filesystem_avail{fstype=\u007e\"ext[234]|btrfs|xfs|zfs\",instance=\"$instance\"})\n/ node_filesystem_size{fstype=\u007e\"ext[234]|btrfs|xfs|zfs\",instance=\"$instance\"}) by (namespace, pod, device)\n",
"format": "time_series",
"intervalFactor": 2,
- "legendFormat": ""
+ "legendFormat": "{{device}}",
+ "refId": "A"
}
],
- "thresholds": "80, 90",
+ "thresholds": [
+
+ ],
+ "timeFrom": null,
+ "timeShift": null,
"title": "Disk Space Usage",
- "type": "singlestat",
- "valueFontSize": "80%",
- "valueMaps": [
+ "tooltip": {
+ "shared": true,
+ "sort": 0,
+ "value_type": "individual"
+ },
+ "type": "graph",
+ "xaxis": {
+ "buckets": null,
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": [
+
+ ]
+ },
+ "yaxes": [
{
- "op": "=",
- "text": "N/A",
- "value": "null"
+ "format": "percentunit",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "percentunit",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
}
- ],
- "valueName": "current"
+ ]
}
],
"repeat": null,
@@ -5721,7 +5728,6 @@ items:
{
"collapse": false,
"collapsed": false,
- "height": "250px",
"panels": [
{
"aliasColors": {
@@ -6026,7 +6032,6 @@ items:
{
"collapse": false,
"collapsed": false,
- "height": "250px",
"panels": [
{
"aliasColors": {
@@ -6067,7 +6072,6 @@ items:
],
"spaceLength": 10,
- "span": 12,
"stack": false,
"steppedLine": false,
"targets": [
@@ -6145,7 +6149,6 @@ items:
{
"collapse": false,
"collapsed": false,
- "height": "250px",
"panels": [
{
"aliasColors": {
@@ -6186,7 +6189,6 @@ items:
],
"spaceLength": 10,
- "span": 12,
"stack": false,
"steppedLine": false,
"targets": [
@@ -6250,7 +6252,6 @@ items:
{
"collapse": false,
"collapsed": false,
- "height": "250px",
"panels": [
{
"aliasColors": {
@@ -6291,7 +6292,6 @@ items:
],
"spaceLength": 10,
- "span": 12,
"stack": false,
"steppedLine": false,
"targets": [
@@ -6516,7 +6516,6 @@ items:
{
"collapse": false,
"collapsed": false,
- "height": "250px",
"panels": [
{
"cacheTimeout": null,
@@ -7101,7 +7100,6 @@ items:
{
"collapse": false,
"collapsed": false,
- "height": "250px",
"panels": [
{
"aliasColors": {
@@ -7142,7 +7140,6 @@ items:
],
"spaceLength": 10,
- "span": 12,
"stack": false,
"steppedLine": false,
"targets": [
--
GitLab