kube-prometheus: Update jsonnet dependencies

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

View File

@@ -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

View File

@@ -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
}
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"repeat": null,
"seriesOverrides": [
],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
"postfix": "",
"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": "",
"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": [