Skip to content

#25 fixed selector for kube-prometheus-stack, changed url for grafana… #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 26, 2021
Merged

#25 fixed selector for kube-prometheus-stack, changed url for grafana… #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
54deef3
#25 fixed selector for kube-prometheus-stack, changed url for grafana…
khalezin Apr 22, 2021
eef96ab
#25 enabled prometheus-stack and loki-stack by defautl
khalezin Apr 22, 2021
7defbea
#25 changed url for loki dashboard in loki-template-file
khalezin Apr 22, 2021
a561bee
#25 removed plugins for grafana, removed labels for service monitors,…
khalezin Apr 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...k8s/examples/eks-kube-prometheus-stack.tf → ...m/layer2-k8s/eks-kube-prometheus-stack.tf
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions ...orm/layer2-k8s/examples/eks-loki-stack.tf → terraform/layer2-k8s/eks-loki-stack.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ resource "helm_release" "loki_stack" {
values = [
local.loki_stack_template
]

}

resource "random_string" "grafana_loki_password" {
Expand Down
5 changes: 2 additions & 3 deletions terraform/layer2-k8s/templates/cluster-autoscaler-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ autoDiscovery:
clusterName: ${cluster_name}

serviceMonitor:
enabled: false
enabled: true
interval: 10s
namespace: monitoring
selector:
prometheus: prometheus-operator
path: /metrics

affinity:
Expand Down
2 changes: 0 additions & 2 deletions terraform/layer2-k8s/templates/external-dns.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ metrics:
serviceMonitor:
enabled: false
namespace: monitoring
selector:
prometheus: prometheus-operator

sources:
- service
Expand Down
10 changes: 3 additions & 7 deletions terraform/layer2-k8s/templates/loki-stack-values.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ loki:
serviceMonitor:
enabled: true
interval: ""
additionalLabels:
app: kube-prometheus-stack-operator
release: kube-prometheus-stack
annotations: {}
scrapeTimeout: 10s

Expand All @@ -29,9 +26,6 @@ promtail:
serviceMonitor:
enabled: true
interval: ""
additionalLabels:
app: kube-prometheus-stack-operator
release: kube-prometheus-stack
annotations: {}
# scrapeTimeout: 10s
tolerations:
Expand Down Expand Up @@ -122,4 +116,6 @@ grafana:
dashboards:
logs:
logs:
url: https://gist.githubusercontent.com/khalezin/49766ed2976d49b0dc84a9c7809392e5/raw/53c0d067713e4da0e6cf187c6515a19e5dd996f5/loki-dashboard-quick-search.json
## Dashboard for quick search application logs for loki with two datasources loki and prometheus - https://grafana.com/grafana/dashboards/12019
url: https://s3.amazonaws.com/grafana-dashboards.maddevs.org/common/aws-eks-base/loki-dashboard-quick-search.json

6 changes: 2 additions & 4 deletions terraform/layer2-k8s/templates/nginx-ingress-certmanager-ssl-termination-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ controller:
metrics:
enabled: true
serviceMonitor:
enabled: false
additionalLabels:
release: prometheus-operator
enabled: true

affinity:
nodeAffinity:
Expand All @@ -41,7 +39,7 @@ controller:
- matchExpressions:
- key: node.kubernetes.io/lifecycle
operator: In
values:
values:
- ondemand

rbac:
Expand Down
6 changes: 2 additions & 4 deletions terraform/layer2-k8s/templates/nginx-ingress-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ controller:
metrics:
enabled: true
serviceMonitor:
enabled: false
additionalLabels:
release: prometheus-operator
enabled: true

podAnnotations:
co.elastic.logs/module: nginx
Expand All @@ -37,7 +35,7 @@ controller:
- matchExpressions:
- key: node.kubernetes.io/lifecycle
operator: In
values:
values:
- ondemand

rbac:
Expand Down
6 changes: 2 additions & 4 deletions terraform/layer2-k8s/templates/prometheus-mysql-exporter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
serviceMonitor:
enabled: false
additionalLabels:
release: prometheus-operator
enabled: true

mysql:
existingSecret: mysql-exporter
Expand All @@ -13,5 +11,5 @@ affinity:
- matchExpressions:
- key: node.kubernetes.io/lifecycle
operator: In
values:
values:
- spot
3 changes: 0 additions & 3 deletions terraform/layer2-k8s/templates/prometheus-postgresql-exporter.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ serviceMonitor:
namespace: monitoring
interval: 30s
telemetryPath: /metrics
labels:
app: kube-prometheus-stack-operator
release: kube-prometheus-stack
timeout: 10s

affinity:
Expand Down
16 changes: 13 additions & 3 deletions terraform/layer2-k8s/templates/prometheus-values.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ prometheus:
- hosts:
- ${prometheus_domain_name}
prometheusSpec:
serviceMonitorSelectorNilUsesHelmValues: false
storageSpec:
volumeClaimTemplate:
spec:
Expand Down Expand Up @@ -125,13 +126,22 @@ grafana:
dashboards:
logs:
logs:
url: https://gist.githubusercontent.com/khalezin/49766ed2976d49b0dc84a9c7809392e5/raw/53c0d067713e4da0e6cf187c6515a19e5dd996f5/loki-dashboard-quick-search.json
## Dashboard for quick search application logs for loki with two datasources loki and prometheus - https://grafana.com/grafana/dashboards/12019
url: https://s3.amazonaws.com/grafana-dashboards.maddevs.org/common/aws-eks-base/loki-dashboard-quick-search.json

k8s:
nginx-ingress:
gnetId: 6927
## Dashboard for nginx-ingress metrics - https://grafana.com/grafana/dashboards/9614
gnetId: 9614
datasource: Prometheus
loki-promtail:
url: https://gist.githubusercontent.com/khalezin/dd63440a404afc7ff13815dded04e74a/raw/613f52a7c57b824ec52c15a8e89ff6ba2ba2f73d/loki-promtail.json
## Dashboard for loki and promtail metrics - https://grafana.com/grafana/dashboards/10880
gnetId: 10880
datasource: Prometheus
cluster-autoscaler:
## Dashboard for cluster-autoscaler metrics - https://grafana.com/grafana/dashboards/3831
gnetId: 3831
datasource: Prometheus

affinity:
nodeAffinity:
Expand Down