Merge remote-tracking branch 'upstream/master'
Showing
- Makefile 3 additions, 0 deletionsMakefile
- assets/prometheus/rules/node.rules 32 additions, 0 deletionsassets/prometheus/rules/node.rules
- docs/developing-alerts-and-dashboards.md 27 additions, 0 deletionsdocs/developing-alerts-and-dashboards.md
- hack/cluster-monitoring/deploy 3 additions, 1 deletionhack/cluster-monitoring/deploy
- hack/cluster-monitoring/teardown 3 additions, 1 deletionhack/cluster-monitoring/teardown
- manifests/grafana/grafana-deployment.yaml 2 additions, 5 deletionsmanifests/grafana/grafana-deployment.yaml
- manifests/prometheus-operator/prometheus-operator.yaml 12 additions, 12 deletionsmanifests/prometheus-operator/prometheus-operator.yaml
- manifests/prometheus/prometheus-cluster-role-binding.yaml 0 additions, 12 deletionsmanifests/prometheus/prometheus-cluster-role-binding.yaml
- manifests/prometheus/prometheus-k8s-role-bindings.yaml 54 additions, 0 deletionsmanifests/prometheus/prometheus-k8s-role-bindings.yaml
- manifests/prometheus/prometheus-k8s-roles.yaml 51 additions, 0 deletionsmanifests/prometheus/prometheus-k8s-roles.yaml
- manifests/prometheus/prometheus-k8s-rules.yaml 32 additions, 0 deletionsmanifests/prometheus/prometheus-k8s-rules.yaml
- manifests/prometheus/prometheus-k8s-service-monitor-kubelet.yaml 2 additions, 0 deletions...ts/prometheus/prometheus-k8s-service-monitor-kubelet.yaml
Loading
Please register or sign in to comment