Skip to content

Commit b5642f7

Browse files
NicolasTNicolasT
authored
Merge branch 'development/1.0' into update-third-party
2 parents 6b65f9d + f837754 commit b5642f7

File tree

8 files changed

+2519
-17
lines changed

8 files changed

+2519
-17
lines changed

‎ChangeLog.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ Kubespray
2222

2323
:ghpull:`210` - deploy `metrics-server` using Helm (:ghissue:`146`)
2424

25+
:ghpull:`189`, :ghpull:`215` - collect `nginx-ingress` metrics and deploy a dashboard (:ghissue:`143`)
26+
2527
:ghpull:`218` - update versions of Kibana and `fluent-bit`
2628

2729
Release 0.2.1 (in development)

‎roles/kube_prometheus/Makefile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ DASHBOARDS = \
44
files/additional-dashboards/kube-prometheus-node-exporter-dashboard.yml \
55
files/additional-dashboards/kube-prometheus-prometheus-dashboard.yml \
66
files/additional-dashboards/kube-prometheus-calico-dashboard.yml \
7-
files/additional-dashboards/kube-prometheus-calico2-dashboard.yml
7+
files/additional-dashboards/kube-prometheus-calico2-dashboard.yml \
8+
files/additional-dashboards/kube-prometheus-nginx-ingress-dashboard.yml
89

910
all: $(DASHBOARDS)
1011
.PHONY: all
@@ -28,6 +29,8 @@ files/additional-dashboards/kube-prometheus-calico-dashboard.yml: ../../vendor/g
2829
files/additional-dashboards/kube-prometheus-calico2-dashboard.yml: ../../vendor/zihaoyu/calico/667584956586c0b869d6ad9573ff8312efa265f1/master/reference/felix/grafana-dashboard.json
2930
files/additional-dashboards/kube-prometheus-calico2-dashboard.yml: TITLE=Kubernetes Calico (Alternative)
3031

32+
files/additional-dashboards/kube-prometheus-nginx-ingress-dashboard.yml: ../../vendor/kubernetes/ingress-nginx/deploy/grafana/dashboards/nginx.yaml
33+
3134
files/additional-dashboards/%.yml:
3235
@mkdir -p files/additional-dashboards
3336
env TITLE="$(TITLE)" FILENAME="$(shell basename $@)" python hack/fix-dashboard.py < $< > $@.tmp || rm -f $@.tmp

‎roles/kube_prometheus/files/additional-dashboards/kube-prometheus-calico2-dashboard.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"bars": false,
2323
"dashLength": 10,
2424
"dashes": false,
25-
"datasource": "prometheus",
25+
"datasource": "${DS_DUMMY}",
2626
"fill": 1,
2727
"id": 15,
2828
"legend": {
@@ -98,7 +98,7 @@
9898
"bars": false,
9999
"dashLength": 10,
100100
"dashes": false,
101-
"datasource": "prometheus",
101+
"datasource": "${DS_DUMMY}",
102102
"fill": 1,
103103
"id": 16,
104104
"legend": {
@@ -178,7 +178,7 @@
178178
"rgba(237, 129, 40, 0.89)",
179179
"rgba(50, 172, 45, 0.97)"
180180
],
181-
"datasource": "prometheus",
181+
"datasource": "${DS_DUMMY}",
182182
"format": "none",
183183
"gauge": {
184184
"maxValue": 100,
@@ -250,7 +250,7 @@
250250
"bars": false,
251251
"dashLength": 10,
252252
"dashes": false,
253-
"datasource": "prometheus",
253+
"datasource": "${DS_DUMMY}",
254254
"fill": 0,
255255
"id": 2,
256256
"legend": {
@@ -328,7 +328,7 @@
328328
"bars": false,
329329
"dashLength": 10,
330330
"dashes": false,
331-
"datasource": "prometheus",
331+
"datasource": "${DS_DUMMY}",
332332
"fill": 1,
333333
"id": 14,
334334
"legend": {
@@ -417,7 +417,7 @@
417417
"bars": false,
418418
"dashLength": 10,
419419
"dashes": false,
420-
"datasource": "prometheus",
420+
"datasource": "${DS_DUMMY}",
421421
"fill": 1,
422422
"id": 3,
423423
"legend": {
@@ -493,7 +493,7 @@
493493
"bars": false,
494494
"dashLength": 10,
495495
"dashes": false,
496-
"datasource": "prometheus",
496+
"datasource": "${DS_DUMMY}",
497497
"fill": 1,
498498
"id": 4,
499499
"legend": {
@@ -569,7 +569,7 @@
569569
"bars": false,
570570
"dashLength": 10,
571571
"dashes": false,
572-
"datasource": "prometheus",
572+
"datasource": "${DS_DUMMY}",
573573
"fill": 1,
574574
"id": 5,
575575
"legend": {
@@ -646,7 +646,7 @@
646646
"bars": false,
647647
"dashLength": 10,
648648
"dashes": false,
649-
"datasource": "prometheus",
649+
"datasource": "${DS_DUMMY}",
650650
"fill": 1,
651651
"id": 6,
652652
"legend": {
@@ -734,7 +734,7 @@
734734
"bars": false,
735735
"dashLength": 10,
736736
"dashes": false,
737-
"datasource": "prometheus",
737+
"datasource": "${DS_DUMMY}",
738738
"fill": 1,
739739
"id": 7,
740740
"legend": {
@@ -810,7 +810,7 @@
810810
"bars": false,
811811
"dashLength": 10,
812812
"dashes": false,
813-
"datasource": "prometheus",
813+
"datasource": "${DS_DUMMY}",
814814
"fill": 1,
815815
"id": 8,
816816
"legend": {
@@ -886,7 +886,7 @@
886886
"bars": false,
887887
"dashLength": 10,
888888
"dashes": false,
889-
"datasource": "prometheus",
889+
"datasource": "${DS_DUMMY}",
890890
"fill": 1,
891891
"id": 10,
892892
"legend": {
@@ -962,7 +962,7 @@
962962
"bars": false,
963963
"dashLength": 10,
964964
"dashes": false,
965-
"datasource": "prometheus",
965+
"datasource": "${DS_DUMMY}",
966966
"fill": 1,
967967
"id": 9,
968968
"legend": {
@@ -1046,7 +1046,7 @@
10461046
"bars": false,
10471047
"dashLength": 10,
10481048
"dashes": false,
1049-
"datasource": "prometheus",
1049+
"datasource": "${DS_DUMMY}",
10501050
"fill": 1,
10511051
"id": 11,
10521052
"legend": {
@@ -1122,7 +1122,7 @@
11221122
"bars": false,
11231123
"dashLength": 10,
11241124
"dashes": false,
1125-
"datasource": "prometheus",
1125+
"datasource": "${DS_DUMMY}",
11261126
"fill": 1,
11271127
"id": 12,
11281128
"legend": {

0 commit comments

Comments
 (0)