From 54deef313bddb922349eb335f29c563ef15f401d Mon Sep 17 00:00:00 2001 From: Khalezin Dmitrii Date: Thu, 22 Apr 2021 16:33:42 +0300 Subject: [PATCH 1/3] #25 fixed selector for kube-prometheus-stack, changed url for grafana dashboards --- .../templates/cluster-autoscaler-values.yaml | 11 +++++++---- terraform/layer2-k8s/templates/external-dns.yaml | 3 ++- ...gress-certmanager-ssl-termination-values.yaml | 7 ++++--- .../templates/nginx-ingress-values.yaml | 7 ++++--- .../templates/prometheus-mysql-exporter.yaml | 7 ++++--- .../layer2-k8s/templates/prometheus-values.tmpl | 16 ++++++++++++++-- 6 files changed, 35 insertions(+), 16 deletions(-) diff --git a/terraform/layer2-k8s/templates/cluster-autoscaler-values.yaml b/terraform/layer2-k8s/templates/cluster-autoscaler-values.yaml index 2f0d423e..f29698e6 100644 --- a/terraform/layer2-k8s/templates/cluster-autoscaler-values.yaml +++ b/terraform/layer2-k8s/templates/cluster-autoscaler-values.yaml @@ -10,10 +10,12 @@ autoDiscovery: clusterName: ${cluster_name} serviceMonitor: - enabled: false + enabled: true + interval: 10s namespace: monitoring selector: - prometheus: prometheus-operator + app: kube-prometheus-stack-operator + release: kube-prometheus-stack path: /metrics affinity: @@ -23,5 +25,6 @@ affinity: - matchExpressions: - key: node.kubernetes.io/lifecycle operator: In - values: - - ondemand \ No newline at end of file + values: + - ondemand + diff --git a/terraform/layer2-k8s/templates/external-dns.yaml b/terraform/layer2-k8s/templates/external-dns.yaml index d6e6da37..3670aeff 100644 --- a/terraform/layer2-k8s/templates/external-dns.yaml +++ b/terraform/layer2-k8s/templates/external-dns.yaml @@ -19,7 +19,8 @@ metrics: enabled: false namespace: monitoring selector: - prometheus: prometheus-operator + app: kube-prometheus-stack-operator + release: kube-prometheus-stack sources: - service diff --git a/terraform/layer2-k8s/templates/nginx-ingress-certmanager-ssl-termination-values.yaml b/terraform/layer2-k8s/templates/nginx-ingress-certmanager-ssl-termination-values.yaml index c333c9e0..535e67d4 100644 --- a/terraform/layer2-k8s/templates/nginx-ingress-certmanager-ssl-termination-values.yaml +++ b/terraform/layer2-k8s/templates/nginx-ingress-certmanager-ssl-termination-values.yaml @@ -30,9 +30,10 @@ controller: metrics: enabled: true serviceMonitor: - enabled: false + enabled: true additionalLabels: - release: prometheus-operator + app: kube-prometheus-stack-operator + release: kube-prometheus-stack affinity: nodeAffinity: @@ -41,7 +42,7 @@ controller: - matchExpressions: - key: node.kubernetes.io/lifecycle operator: In - values: + values: - ondemand rbac: diff --git a/terraform/layer2-k8s/templates/nginx-ingress-values.yaml b/terraform/layer2-k8s/templates/nginx-ingress-values.yaml index fdc73ad2..2135e374 100644 --- a/terraform/layer2-k8s/templates/nginx-ingress-values.yaml +++ b/terraform/layer2-k8s/templates/nginx-ingress-values.yaml @@ -21,9 +21,10 @@ controller: metrics: enabled: true serviceMonitor: - enabled: false + enabled: true additionalLabels: - release: prometheus-operator + app: kube-prometheus-stack-operator + release: kube-prometheus-stack podAnnotations: co.elastic.logs/module: nginx @@ -37,7 +38,7 @@ controller: - matchExpressions: - key: node.kubernetes.io/lifecycle operator: In - values: + values: - ondemand rbac: diff --git a/terraform/layer2-k8s/templates/prometheus-mysql-exporter.yaml b/terraform/layer2-k8s/templates/prometheus-mysql-exporter.yaml index 1724ed94..3d08302f 100644 --- a/terraform/layer2-k8s/templates/prometheus-mysql-exporter.yaml +++ b/terraform/layer2-k8s/templates/prometheus-mysql-exporter.yaml @@ -1,7 +1,8 @@ serviceMonitor: - enabled: false + enabled: true additionalLabels: - release: prometheus-operator + app: kube-prometheus-stack-operator + release: kube-prometheus-stack mysql: existingSecret: mysql-exporter @@ -13,5 +14,5 @@ affinity: - matchExpressions: - key: node.kubernetes.io/lifecycle operator: In - values: + values: - spot diff --git a/terraform/layer2-k8s/templates/prometheus-values.tmpl b/terraform/layer2-k8s/templates/prometheus-values.tmpl index 625f693e..891d723c 100644 --- a/terraform/layer2-k8s/templates/prometheus-values.tmpl +++ b/terraform/layer2-k8s/templates/prometheus-values.tmpl @@ -125,13 +125,25 @@ grafana: dashboards: logs: logs: - url: https://gist.githubusercontent.com/khalezin/49766ed2976d49b0dc84a9c7809392e5/raw/53c0d067713e4da0e6cf187c6515a19e5dd996f5/loki-dashboard-quick-search.json + url: https://s3.amazonaws.com/grafana-dashboards.maddevs.org/common/aws-eks-base/loki-dashboard-quick-search.json + k8s: nginx-ingress: gnetId: 6927 datasource: Prometheus loki-promtail: - url: https://gist.githubusercontent.com/khalezin/dd63440a404afc7ff13815dded04e74a/raw/613f52a7c57b824ec52c15a8e89ff6ba2ba2f73d/loki-promtail.json + url: https://s3.amazonaws.com/grafana-dashboards.maddevs.org/common/aws-eks-base/loki-promtail.json + core-dns: + url: https://s3.amazonaws.com/grafana-dashboards.maddevs.org/common/aws-eks-base/core-dns.json + cluster-autoscaler: + url: https://s3.amazonaws.com/grafana-dashboards.maddevs.org/common/aws-eks-base/cluster-autoscaler.json + + + plugins: + - grafana-piechart-panel + - simpod-json-datasource + - devopsprodigy-kubegraf-app + - grafana-worldmap-panel affinity: nodeAffinity: From eef96abe5d8bf846f3f1cbce261012ad7811d9f2 Mon Sep 17 00:00:00 2001 From: Khalezin Dmitrii Date: Thu, 22 Apr 2021 17:51:14 +0300 Subject: [PATCH 2/3] #25 enabled prometheus-stack and loki-stack by defautl --- terraform/layer2-k8s/{examples => }/eks-kube-prometheus-stack.tf | 0 terraform/layer2-k8s/{examples => }/eks-loki-stack.tf | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename terraform/layer2-k8s/{examples => }/eks-kube-prometheus-stack.tf (100%) rename terraform/layer2-k8s/{examples => }/eks-loki-stack.tf (100%) diff --git a/terraform/layer2-k8s/examples/eks-kube-prometheus-stack.tf b/terraform/layer2-k8s/eks-kube-prometheus-stack.tf similarity index 100% rename from terraform/layer2-k8s/examples/eks-kube-prometheus-stack.tf rename to terraform/layer2-k8s/eks-kube-prometheus-stack.tf diff --git a/terraform/layer2-k8s/examples/eks-loki-stack.tf b/terraform/layer2-k8s/eks-loki-stack.tf similarity index 100% rename from terraform/layer2-k8s/examples/eks-loki-stack.tf rename to terraform/layer2-k8s/eks-loki-stack.tf From 7defbea9ab3d1fa40e62d7b601a8884cc40ce757 Mon Sep 17 00:00:00 2001 From: Khalezin Dmitrii Date: Thu, 22 Apr 2021 17:56:15 +0300 Subject: [PATCH 3/3] #25 changed url for loki dashboard in loki-template-file --- terraform/layer2-k8s/templates/loki-stack-values.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/terraform/layer2-k8s/templates/loki-stack-values.tmpl b/terraform/layer2-k8s/templates/loki-stack-values.tmpl index 39fbfffc..740b8eb6 100644 --- a/terraform/layer2-k8s/templates/loki-stack-values.tmpl +++ b/terraform/layer2-k8s/templates/loki-stack-values.tmpl @@ -122,4 +122,5 @@ grafana: dashboards: logs: logs: - url: https://gist.githubusercontent.com/khalezin/49766ed2976d49b0dc84a9c7809392e5/raw/53c0d067713e4da0e6cf187c6515a19e5dd996f5/loki-dashboard-quick-search.json + url: https://s3.amazonaws.com/grafana-dashboards.maddevs.org/common/aws-eks-base/loki-dashboard-quick-search.json +