synchronize from typhoon
This commit is contained in:
parent
a0f6cb9c66
commit
3d041d4cb0
3 changed files with 7 additions and 7 deletions
|
|
@ -23,7 +23,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: grafana
|
- name: grafana
|
||||||
image: docker.io/grafana/grafana:7.0.0-beta3
|
image: docker.io/grafana/grafana:7.0.0
|
||||||
env:
|
env:
|
||||||
- name: GF_PATHS_CONFIG
|
- name: GF_PATHS_CONFIG
|
||||||
value: "/etc/grafana/custom.ini"
|
value: "/etc/grafana/custom.ini"
|
||||||
|
|
|
||||||
|
|
@ -3,10 +3,10 @@ grafana_files:
|
||||||
- grafana/config.yaml
|
- grafana/config.yaml
|
||||||
- grafana/dashboards-coredns.yaml
|
- grafana/dashboards-coredns.yaml
|
||||||
- grafana/dashboards-etcd.yaml
|
- grafana/dashboards-etcd.yaml
|
||||||
- grafana/dashboards-k8s.yaml
|
|
||||||
- grafana/dashboards-k8s-nodes.yaml
|
- grafana/dashboards-k8s-nodes.yaml
|
||||||
- grafana/dashboards-k8s-resources-1.yaml
|
- grafana/dashboards-k8s-resources-1.yaml
|
||||||
- grafana/dashboards-k8s-resources-2.yaml
|
- grafana/dashboards-k8s-resources-2.yaml
|
||||||
|
- grafana/dashboards-k8s.yaml
|
||||||
- grafana/dashboards-nginx-ingress.yaml
|
- grafana/dashboards-nginx-ingress.yaml
|
||||||
- grafana/dashboards-node-exporter.yaml
|
- grafana/dashboards-node-exporter.yaml
|
||||||
- grafana/dashboards-prom.yaml
|
- grafana/dashboards-prom.yaml
|
||||||
|
|
|
||||||
|
|
@ -1,22 +1,22 @@
|
||||||
---
|
---
|
||||||
prometheus_files:
|
prometheus_files:
|
||||||
- prometheus/rbac/cluster-role.yaml
|
|
||||||
- prometheus/rbac/cluster-role-binding.yaml
|
- prometheus/rbac/cluster-role-binding.yaml
|
||||||
|
- prometheus/rbac/cluster-role.yaml
|
||||||
# - prometheus/0-namespace.yaml
|
# - prometheus/0-namespace.yaml
|
||||||
- prometheus/config.yaml
|
- prometheus/config.yaml
|
||||||
- prometheus/deployment.yaml
|
- prometheus/deployment.yaml
|
||||||
- prometheus/network-policy.yaml
|
- prometheus/network-policy.yaml
|
||||||
- prometheus/rules.yaml
|
- prometheus/rules.yaml
|
||||||
- prometheus/service.yaml
|
|
||||||
- prometheus/service-account.yaml
|
- prometheus/service-account.yaml
|
||||||
|
- prometheus/service.yaml
|
||||||
- prometheus/discovery/kube-controller-manager.yaml
|
- prometheus/discovery/kube-controller-manager.yaml
|
||||||
- prometheus/discovery/kube-proxy.yaml
|
- prometheus/discovery/kube-proxy.yaml
|
||||||
- prometheus/discovery/kube-scheduler.yaml
|
- prometheus/discovery/kube-scheduler.yaml
|
||||||
- prometheus/exporters/kube-state-metrics/cluster-role.yaml
|
|
||||||
- prometheus/exporters/kube-state-metrics/cluster-role-binding.yaml
|
- prometheus/exporters/kube-state-metrics/cluster-role-binding.yaml
|
||||||
|
- prometheus/exporters/kube-state-metrics/cluster-role.yaml
|
||||||
- prometheus/exporters/kube-state-metrics/deployment.yaml
|
- prometheus/exporters/kube-state-metrics/deployment.yaml
|
||||||
- prometheus/exporters/kube-state-metrics/service.yaml
|
|
||||||
- prometheus/exporters/kube-state-metrics/service-account.yaml
|
- prometheus/exporters/kube-state-metrics/service-account.yaml
|
||||||
|
- prometheus/exporters/kube-state-metrics/service.yaml
|
||||||
- prometheus/exporters/node-exporter/daemonset.yaml
|
- prometheus/exporters/node-exporter/daemonset.yaml
|
||||||
- prometheus/exporters/node-exporter/service.yaml
|
|
||||||
- prometheus/exporters/node-exporter/service-account.yaml
|
- prometheus/exporters/node-exporter/service-account.yaml
|
||||||
|
- prometheus/exporters/node-exporter/service.yaml
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue