easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*: normalize namings

Browse Source
This commit is contained in:
Frederic Branczyk
2017-03-03 16:43:52 +01:00
parent 333bd23434
commit 9e11e17a71
14 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -135,4 +135,4 @@ monitoring etcd-k8s 172.17.4.51:2379
``` ```
## Other Documentation ## Other Documentation
[Install Docs for a cluster created with KOPS on AWS](docs/KOPSonAWS.md) [Install Docs for a cluster created with KOPS on AWS](docs/KOPSonAWS.md)

4
hack/cluster-monitoring/deploy
View File

@@ -27,7 +27,7 @@ kctl apply -f manifests/exporters
kctl apply -f manifests/grafana kctl apply -f manifests/grafana
kctl apply -f manifests/prometheus/prometheus-k8s-rules.yaml kctl apply -f manifests/prometheus/prometheus-k8s-rules.yaml
kctl apply -f manifests/prometheus/prometheus-k8s-svc.yaml kctl apply -f manifests/prometheus/prometheus-k8s-service.yaml
kctl apply -f manifests/alertmanager/alertmanager-config.yaml kctl apply -f manifests/alertmanager/alertmanager-config.yaml
kctl apply -f manifests/alertmanager/alertmanager-service.yaml kctl apply -f manifests/alertmanager/alertmanager-service.yaml
@@ -35,7 +35,7 @@ kctl apply -f manifests/alertmanager/alertmanager-service.yaml
# `kubectl apply` is currently not working for third party resources so we are # `kubectl apply` is currently not working for third party resources so we are
# using `kubectl create` here for the time being. # using `kubectl create` here for the time being.
# (https://github.com/kubernetes/kubernetes/issues/29542) # (https://github.com/kubernetes/kubernetes/issues/29542)
kctl create -f manifests/prometheus/prometheus-k8s-servicemonitor.yaml kctl create -f manifests/prometheus/prometheus-k8s-servicemonitors.yaml
kctl create -f manifests/prometheus/prometheus-k8s.yaml kctl create -f manifests/prometheus/prometheus-k8s.yaml
kctl create -f manifests/alertmanager/alertmanager.yaml kctl create -f manifests/alertmanager/alertmanager.yaml

2
hack/scripts/generate-configmaps.sh
View File

@@ -4,5 +4,5 @@
kubectl create configmap --dry-run=true prometheus-k8s-rules --from-file=assets/prometheus/rules/ -oyaml > manifests/prometheus/prometheus-k8s-rules.yaml kubectl create configmap --dry-run=true prometheus-k8s-rules --from-file=assets/prometheus/rules/ -oyaml > manifests/prometheus/prometheus-k8s-rules.yaml
# Generate Dashboard ConfigMap # Generate Dashboard ConfigMap
kubectl create configmap --dry-run=true grafana-dashboards --from-file=assets/grafana/ -oyaml > manifests/grafana/grafana-cm.yaml kubectl create configmap --dry-run=true grafana-dashboards --from-file=assets/grafana/ -oyaml > manifests/grafana/grafana-dashboards.yaml

0
manifests/exporters/kube-state-metrics-depl.yaml → manifests/exporters/kube-state-metrics-deployment.yaml
View File

0
manifests/exporters/kube-state-metrics-svc.yaml → manifests/exporters/kube-state-metrics-service.yaml
View File

0
manifests/exporters/node-exporter-ds.yaml → manifests/exporters/node-exporter-daemonset.yaml
View File

0
manifests/exporters/node-exporter-svc.yaml → manifests/exporters/node-exporter-service.yaml
View File

0
manifests/grafana/grafana-cm.yaml → manifests/grafana/grafana-dashboards.yaml
View File

0
manifests/grafana/grafana-depl.yaml → manifests/grafana/grafana-deployment.yaml
View File

0
manifests/grafana/grafana-svc.yaml → manifests/grafana/grafana-service.yaml
View File

2
manifests/prometheus-operator.yaml
View File

@@ -16,7 +16,7 @@ spec:
image: quay.io/coreos/prometheus-operator:v0.6.0 image: quay.io/coreos/prometheus-operator:v0.6.0
args: args:
- "--kubelet-object=kube-system/kubelet" - "--kubelet-object=kube-system/kubelet"
- "--config-reloader-image=quay.io/coreos/configmap-reload:latest" - "--config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1"
resources: resources:
requests: requests:
cpu: 100m cpu: 100m

0
manifests/prometheus/prometheus-k8s-svc.yaml → manifests/prometheus/prometheus-k8s-service.yaml
View File

0
manifests/prometheus/prometheus-k8s-servicemonitor.yaml → manifests/prometheus/prometheus-k8s-servicemonitors.yaml
View File

1
manifests/prometheus/prometheus-k8s.yaml
View File

@@ -5,6 +5,7 @@ metadata:
labels: labels:
prometheus: k8s prometheus: k8s
spec: spec:
replicas: 2
version: v1.5.2 version: v1.5.2
serviceMonitorSelector: serviceMonitorSelector:
matchExpression: matchExpression: