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

Generate correct manifests/

Browse Source
This commit is contained in:
Matthias Loibl
2019-06-04 11:47:05 +02:00
parent 9d066577a5
commit f7f9bdea91
5 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/alertmanager-alertmanager.yaml
View File

@@ -15,4 +15,4 @@ spec:
runAsNonRoot: true runAsNonRoot: true
runAsUser: 1000 runAsUser: 1000
serviceAccountName: alertmanager-main serviceAccountName: alertmanager-main
version: v0.16.2 version: v0.17.0

2
manifests/grafana-dashboardDatasources.yaml
View File

@@ -1,6 +1,6 @@
apiVersion: v1 apiVersion: v1
data: data:
prometheus.yaml: ewogICAgImFwaVZlcnNpb24iOiAxLAogICAgImRhdGFzb3VyY2VzIjogWwogICAgICAgIHsKICAgICAgICAgICAgImFjY2VzcyI6ICJwcm94eSIsCiAgICAgICAgICAgICJlZGl0YWJsZSI6IGZhbHNlLAogICAgICAgICAgICAibmFtZSI6ICJwcm9tZXRoZXVzIiwKICAgICAgICAgICAgIm9yZ0lkIjogMSwKICAgICAgICAgICAgInR5cGUiOiAicHJvbWV0aGV1cyIsCiAgICAgICAgICAgICJ1cmwiOiAiaHR0cDovL3Byb21ldGhldXMtazhzLm1vbml0b3Jpbmcuc3ZjOjkwOTAiLAogICAgICAgICAgICAidmVyc2lvbiI6IDEKICAgICAgICB9CiAgICBdCn0= datasources.yaml: ewogICAgImFwaVZlcnNpb24iOiAxLAogICAgImRhdGFzb3VyY2VzIjogWwogICAgICAgIHsKICAgICAgICAgICAgImFjY2VzcyI6ICJwcm94eSIsCiAgICAgICAgICAgICJlZGl0YWJsZSI6IGZhbHNlLAogICAgICAgICAgICAibmFtZSI6ICJwcm9tZXRoZXVzIiwKICAgICAgICAgICAgIm9yZ0lkIjogMSwKICAgICAgICAgICAgInR5cGUiOiAicHJvbWV0aGV1cyIsCiAgICAgICAgICAgICJ1cmwiOiAiaHR0cDovL3Byb21ldGhldXMtazhzLm1vbml0b3Jpbmcuc3ZjOjkwOTAiLAogICAgICAgICAgICAidmVyc2lvbiI6IDEKICAgICAgICB9CiAgICBdCn0=
kind: Secret kind: Secret
metadata: metadata:
name: grafana-datasources name: grafana-datasources

39
manifests/grafana-dashboardDefinitions.yaml
View File

@@ -3047,24 +3047,6 @@ items:
"type": "number", "type": "number",
"unit": "short" "unit": "short"
}, },
{
"alias": "CPU Usage",
"colorMode": null,
"colors": [
],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"link": false,
"linkTooltip": "Drill down",
"linkUrl": "",
"pattern": "Value #C",
"thresholds": [
],
"type": "number",
"unit": "short"
},
{ {
"alias": "Memory Usage", "alias": "Memory Usage",
"colorMode": null, "colorMode": null,
@@ -3076,7 +3058,7 @@ items:
"link": false, "link": false,
"linkTooltip": "Drill down", "linkTooltip": "Drill down",
"linkUrl": "", "linkUrl": "",
"pattern": "Value #D", "pattern": "Value #C",
"thresholds": [ "thresholds": [
], ],
@@ -3094,7 +3076,7 @@ items:
"link": false, "link": false,
"linkTooltip": "Drill down", "linkTooltip": "Drill down",
"linkUrl": "", "linkUrl": "",
"pattern": "Value #E", "pattern": "Value #D",
"thresholds": [ "thresholds": [
], ],
@@ -3112,7 +3094,7 @@ items:
"link": false, "link": false,
"linkTooltip": "Drill down", "linkTooltip": "Drill down",
"linkUrl": "", "linkUrl": "",
"pattern": "Value #F", "pattern": "Value #E",
"thresholds": [ "thresholds": [
], ],
@@ -3130,7 +3112,7 @@ items:
"link": false, "link": false,
"linkTooltip": "Drill down", "linkTooltip": "Drill down",
"linkUrl": "", "linkUrl": "",
"pattern": "Value #G", "pattern": "Value #F",
"thresholds": [ "thresholds": [
], ],
@@ -3148,7 +3130,7 @@ items:
"link": false, "link": false,
"linkTooltip": "Drill down", "linkTooltip": "Drill down",
"linkUrl": "", "linkUrl": "",
"pattern": "Value #H", "pattern": "Value #G",
"thresholds": [ "thresholds": [
], ],
@@ -8005,11 +7987,18 @@ items:
"steppedLine": false, "steppedLine": false,
"targets": [ "targets": [
{ {
"expr": "node:node_filesystem_usage:{cluster=\"$cluster\"}", "expr": "max by (namespace, pod, device) ((node_filesystem_size_bytes{cluster=\"$cluster\", fstype=~\"ext[234]|btrfs|xfs|zfs\", instance=\"$instance\", job=\"node-exporter\"} - node_filesystem_avail_bytes{cluster=\"$cluster\", fstype=~\"ext[234]|btrfs|xfs|zfs\", instance=\"$instance\", job=\"node-exporter\"}) / node_filesystem_size_bytes{cluster=\"$cluster\", fstype=~\"ext[234]|btrfs|xfs|zfs\", instance=\"$instance\", job=\"node-exporter\"})",
"format": "time_series", "format": "time_series",
"intervalFactor": 2, "intervalFactor": 2,
"legendFormat": "{{device}}", "legendFormat": "disk used",
"refId": "A" "refId": "A"
},
{
"expr": "max by (namespace, pod, device) (node_filesystem_avail_bytes{cluster=\"$cluster\", fstype=~\"ext[234]|btrfs|xfs|zfs\", instance=\"$instance\", job=\"node-exporter\"} / node_filesystem_size_bytes{cluster=\"$cluster\", fstype=~\"ext[234]|btrfs|xfs|zfs\", instance=\"$instance\", job=\"node-exporter\"})",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "disk free",
"refId": "B"
} }
], ],
"thresholds": [ "thresholds": [

2
manifests/node-exporter-daemonset.yaml
View File

@@ -61,7 +61,7 @@ spec:
resources: resources:
limits: limits:
cpu: 20m cpu: 20m
memory: 40Mi memory: 60Mi
requests: requests:
cpu: 10m cpu: 10m
memory: 20Mi memory: 20Mi

4
manifests/prometheus-rules.yaml
View File

@@ -278,12 +278,12 @@ spec:
) )
record: node:node_disk_saturation:avg_irate record: node:node_disk_saturation:avg_irate
- expr: | - expr: |
max by (namespace, pod, device) ((node_filesystem_size_bytes{fstype=~"ext[234]|btrfs|xfs|zfs"} max by (instance, namespace, pod, device) ((node_filesystem_size_bytes{fstype=~"ext[234]|btrfs|xfs|zfs"}
- node_filesystem_avail_bytes{fstype=~"ext[234]|btrfs|xfs|zfs"}) - node_filesystem_avail_bytes{fstype=~"ext[234]|btrfs|xfs|zfs"})
/ node_filesystem_size_bytes{fstype=~"ext[234]|btrfs|xfs|zfs"}) / node_filesystem_size_bytes{fstype=~"ext[234]|btrfs|xfs|zfs"})
record: 'node:node_filesystem_usage:' record: 'node:node_filesystem_usage:'
- expr: | - expr: |
max by (namespace, pod, device) (node_filesystem_avail_bytes{fstype=~"ext[234]|btrfs|xfs|zfs"} / node_filesystem_size_bytes{fstype=~"ext[234]|btrfs|xfs|zfs"}) max by (instance, namespace, pod, device) (node_filesystem_avail_bytes{fstype=~"ext[234]|btrfs|xfs|zfs"} / node_filesystem_size_bytes{fstype=~"ext[234]|btrfs|xfs|zfs"})
record: 'node:node_filesystem_avail:' record: 'node:node_filesystem_avail:'
- expr: | - expr: |
sum(irate(node_network_receive_bytes_total{job="node-exporter",device!~"veth.+"}[1m])) + sum(irate(node_network_receive_bytes_total{job="node-exporter",device!~"veth.+"}[1m])) +