Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

kube-prometheus
- Activity
- Members
- Releases
- Model registry
- Model experiments

Snippets Groups Projects

e367cfa9

Commit e367cfa9 authored 8 years ago by Fabian Reinartz

Downloads
- Plain Diff

Merge branch 'master' of github.com:coreos/kube-prometheus

parents 73b8e968 add3f250

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

assets/prometheus/prometheus.yaml 68 additions, 0 deletions

assets/prometheus/prometheus.yaml
assets/prometheus/rules/etcd2.rules 0 additions, 0 deletions

assets/prometheus/rules/etcd2.rules
assets/prometheus/rules/kubernetes.rules 4 additions, 2 deletions

assets/prometheus/rules/kubernetes.rules
hack/scripts/generate-configmaps.sh 4 additions, 1 deletion

hack/scripts/generate-configmaps.sh
manifests/prometheus/prometheus-k8s-cm.yaml 8 additions, 9 deletions

manifests/prometheus/prometheus-k8s-cm.yaml
manifests/prometheus/prometheus-k8s-rules.yaml 4 additions, 2 deletions

manifests/prometheus/prometheus-k8s-rules.yaml

with 88 additions and 14 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment