easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kube-prometheus: Update jsonnet dependencies

Browse Source
This commit is contained in:
Frederic Branczyk
2018-08-27 14:07:15 -06:00
parent 4c90bd93b0
commit b213437fb6
3 changed files with 83 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jsonnetfile.lock.json
View File

@@ -8,7 +8,7 @@
"subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus" "subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
} }
}, },
"version": "43d93161ee1d5215a25e6a35582605cf2f4c26dd" "version": "66226d27f1fca6096c420b46b097b9e2475189e6"
}, },
{ {
"name": "ksonnet", "name": "ksonnet",
@@ -28,7 +28,7 @@
"subdir": "" "subdir": ""
} }
}, },
"version": "a2b417a9aa27d508d1c0b730ace0dff20b3b7bf7" "version": "4090e091fee875fd2baec1531a7ef9c2ab58c99b"
}, },
{ {
"name": "grafonnet", "name": "grafonnet",
@@ -38,7 +38,7 @@
"subdir": "grafonnet" "subdir": "grafonnet"
} }
}, },
"version": "0fdef020a6360415d2c8fdc82b29122583e4df05" "version": "d21784739a9adc7992c0382d1efa42be4ddb3044"
}, },
{ {
"name": "grafana-builder", "name": "grafana-builder",
@@ -68,7 +68,7 @@
"subdir": "jsonnet/prometheus-operator" "subdir": "jsonnet/prometheus-operator"
} }
}, },
"version": "ba92b2f232ef24684b9dc6bde03b74e1630909a6" "version": "27b1eb72d9d93e5ab447121e2b884bc558bde01d"
}, },
{ {
"name": "etcd-mixin", "name": "etcd-mixin",
@@ -78,7 +78,7 @@
"subdir": "Documentation/etcd-mixin" "subdir": "Documentation/etcd-mixin"
} }
}, },
"version": "bdc333359b618b7519660ead7a4ef30288f8d350" "version": "af85949b416547ed0989b396a28fe77f65978828"
} }
] ]
} }

4
manifests/0prometheus-operator-deployment.yaml
View File

@@ -20,8 +20,8 @@ spec:
- --kubelet-service=kube-system/kubelet - --kubelet-service=kube-system/kubelet
- --logtostderr=true - --logtostderr=true
- --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1 - --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
- --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.23.1 - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.23.2
image: quay.io/coreos/prometheus-operator:v0.23.1 image: quay.io/coreos/prometheus-operator:v0.23.2
name: prometheus-operator name: prometheus-operator
ports: ports:
- containerPort: 8080 - containerPort: 8080

155
manifests/grafana-dashboardDefinitions.yaml
View File

@@ -796,7 +796,7 @@ items:
"steppedLine": false, "steppedLine": false,
"targets": [ "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", "format": "time_series",
"intervalFactor": 2, "intervalFactor": 2,
"legendFormat": "{{node}}", "legendFormat": "{{node}}",
@@ -1712,10 +1712,10 @@ items:
"steppedLine": false, "steppedLine": false,
"targets": [ "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", "format": "time_series",
"intervalFactor": 2, "intervalFactor": 2,
"legendFormat": "Disk", "legendFormat": "{{device}}",
"legendLink": null, "legendLink": null,
"step": 10 "step": 10
} }
@@ -4914,7 +4914,6 @@ items:
{ {
"collapse": false, "collapse": false,
"collapsed": false, "collapsed": false,
"height": "250px",
"panels": [ "panels": [
{ {
"aliasColors": { "aliasColors": {
@@ -5124,7 +5123,6 @@ items:
{ {
"collapse": false, "collapse": false,
"collapsed": false, "collapsed": false,
"height": "250px",
"panels": [ "panels": [
{ {
"aliasColors": { "aliasColors": {
@@ -5165,7 +5163,7 @@ items:
], ],
"spaceLength": 10, "spaceLength": 10,
"span": 6, "span": 9,
"stack": false, "stack": false,
"steppedLine": false, "steppedLine": false,
"targets": [ "targets": [
@@ -5309,7 +5307,6 @@ items:
{ {
"collapse": false, "collapse": false,
"collapsed": false, "collapsed": false,
"height": "250px",
"panels": [ "panels": [
{ {
"aliasColors": { "aliasColors": {
@@ -5515,7 +5512,6 @@ items:
{ {
"collapse": false, "collapse": false,
"collapsed": false, "collapsed": false,
"height": "250px",
"panels": [ "panels": [
{ {
"aliasColors": { "aliasColors": {
@@ -5563,7 +5559,7 @@ items:
} }
], ],
"spaceLength": 10, "spaceLength": 10,
"span": 9, "span": 6,
"stack": false, "stack": false,
"steppedLine": false, "steppedLine": false,
"targets": [ "targets": [
@@ -5630,84 +5626,95 @@ items:
] ]
}, },
{ {
"cacheTimeout": null, "aliasColors": {
"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
}, },
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
"fill": 1,
"gridPos": { "gridPos": {
}, },
"id": 9, "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": [ "links": [
], ],
"mappingType": 1, "nullPointMode": "null",
"mappingTypes": [ "percentage": false,
{ "pointradius": 5,
"name": "value to text", "points": false,
"value": 1 "renderer": "flot",
}, "repeat": null,
{ "seriesOverrides": [
"name": "range to text",
"value": 2
}
], ],
"maxDataPoints": 100, "spaceLength": 10,
"nullPointMode": "connected", "span": 6,
"nullText": null, "stack": false,
"postfix": "", "steppedLine": false,
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
"rangeMaps": [
{
"from": "null",
"text": "N/A",
"to": "null"
}
],
"span": 3,
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": false,
"lineColor": "rgb(31, 120, 193)",
"show": false
},
"tableColumn": "",
"targets": [ "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", "format": "time_series",
"intervalFactor": 2, "intervalFactor": 2,
"legendFormat": "" "legendFormat": "{{device}}",
"refId": "A"
} }
], ],
"thresholds": "80, 90", "thresholds": [
],
"timeFrom": null,
"timeShift": null,
"title": "Disk Space Usage", "title": "Disk Space Usage",
"type": "singlestat", "tooltip": {
"valueFontSize": "80%", "shared": true,
"valueMaps": [ "sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": [
]
},
"yaxes": [
{ {
"op": "=", "format": "percentunit",
"text": "N/A", "label": null,
"value": "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, "repeat": null,
@@ -5721,7 +5728,6 @@ items:
{ {
"collapse": false, "collapse": false,
"collapsed": false, "collapsed": false,
"height": "250px",
"panels": [ "panels": [
{ {
"aliasColors": { "aliasColors": {
@@ -6026,7 +6032,6 @@ items:
{ {
"collapse": false, "collapse": false,
"collapsed": false, "collapsed": false,
"height": "250px",
"panels": [ "panels": [
{ {
"aliasColors": { "aliasColors": {
@@ -6067,7 +6072,6 @@ items:
], ],
"spaceLength": 10, "spaceLength": 10,
"span": 12,
"stack": false, "stack": false,
"steppedLine": false, "steppedLine": false,
"targets": [ "targets": [
@@ -6145,7 +6149,6 @@ items:
{ {
"collapse": false, "collapse": false,
"collapsed": false, "collapsed": false,
"height": "250px",
"panels": [ "panels": [
{ {
"aliasColors": { "aliasColors": {
@@ -6186,7 +6189,6 @@ items:
], ],
"spaceLength": 10, "spaceLength": 10,
"span": 12,
"stack": false, "stack": false,
"steppedLine": false, "steppedLine": false,
"targets": [ "targets": [
@@ -6250,7 +6252,6 @@ items:
{ {
"collapse": false, "collapse": false,
"collapsed": false, "collapsed": false,
"height": "250px",
"panels": [ "panels": [
{ {
"aliasColors": { "aliasColors": {
@@ -6291,7 +6292,6 @@ items:
], ],
"spaceLength": 10, "spaceLength": 10,
"span": 12,
"stack": false, "stack": false,
"steppedLine": false, "steppedLine": false,
"targets": [ "targets": [
@@ -6516,7 +6516,6 @@ items:
{ {
"collapse": false, "collapse": false,
"collapsed": false, "collapsed": false,
"height": "250px",
"panels": [ "panels": [
{ {
"cacheTimeout": null, "cacheTimeout": null,
@@ -7101,7 +7100,6 @@ items:
{ {
"collapse": false, "collapse": false,
"collapsed": false, "collapsed": false,
"height": "250px",
"panels": [ "panels": [
{ {
"aliasColors": { "aliasColors": {
@@ -7142,7 +7140,6 @@ items:
], ],
"spaceLength": 10, "spaceLength": 10,
"span": 12,
"stack": false, "stack": false,
"steppedLine": false, "steppedLine": false,
"targets": [ "targets": [