Merge branch 'master' of github.com:yunlzheng/prometheus-book

README.md

@@ -73,11 +73,8 @@ Prometheus操作指南：云原生监控之道
   * [Kubernetes下的服务发现](./kubernetes/service-discovery-with-kubernetes.md)
   * [监控Kubernetes集群](./kubernetes/use-prometheus-monitor-kubernetes.md)
   * [使用Grafana创建可视化仪表盘](./kubernetes/use-grafana-in-k8s.md)
-  * [使用Prometheus Operator](./kubernetes/use-prometheus-operator.md)
   * [使用Opertor管理Prometheus](./kubernetes/use-operator-manage-prometheus.md)
-    * [Prometheus Operator架构](./kubernetes/operator-architecture.md)
     * [使用Prometheus Operator监控用户应用](./kubernetes/use-operator-monitor-app.md)
-    * [使用Prometheus Operator监控集群](./kubernetes/use-operator-monitor-app.md)
-    * [Prometheus Operator下的告警处理](./kubernetes/use-operator-alerting.md)
+    * [使用Prometheus Operator管理Alertmanager](./kubernetes/use-operator-alerting.md)
 * [第9章 使用Prometheus监控Rancher集群](./rancher/README.md)
 * [参考资料](./REFERENCES.md)

SUMMARY.md

@@ -52,8 +52,6 @@
     * [表格：Tabel面板](./grafana/use_table_panel.md)
   * [模板化Dashboard](./grafana/templating.md)
   * [共享Dashboard](./grafana/share_dashboard.md)
-  * 告警
-  * 团队与权限管理
   * [小结](./grafana/SUMMARY.md)
 * [第6章 集群与高可用](./ha/READMD.md)
   * [本地存储](./ha/prometheus-local-storage.md)
@@ -78,10 +76,9 @@
   * [监控Kubernetes集群](./kubernetes/use-prometheus-monitor-kubernetes.md)
   * [使用Grafana创建可视化仪表盘](./kubernetes/use-grafana-in-k8s.md)
   * [使用Opertor管理Prometheus](./kubernetes/use-operator-manage-prometheus.md)
-    * [Prometheus Operator架构](./kubernetes/operator-architecture.md)
     * [使用Prometheus Operator监控用户应用](./kubernetes/use-operator-monitor-app.md)
-    * [使用Prometheus Operator监控集群](./kubernetes/use-operator-monitor-app.md)
-    * [Prometheus Operator下的告警处理](./kubernetes/use-operator-alerting.md)
+    * [使用Prometheus Operator管理Alertmanager](./kubernetes/use-operator-alerting.md)
+  * [基于Prometheus的弹性伸缩](./kubernetes/hap-with-prometheus.md)
   * [小结](./kubernetes/SUMMARY.md)
 * [第9章 使用Prometheus监控Rancher集群](./rancher/README.md)
 * [参考资料](./REFERENCES.md)

examples/prometheus-operator/00prometheus.yaml

@@ -0,0 +1,9 @@
+apiVersion: monitoring.coreos.com/v1
+kind: Prometheus
+metadata:
+  name: prometheus
+  labels:
+    prometheus: prometheus
+spec:
+  replicas: 2
+  serviceAccountName: prometheus

examples/prometheus-operator/01prometheus.yaml

@@ -0,0 +1,12 @@
+apiVersion: monitoring.coreos.com/v1
+kind: Prometheus
+metadata:
+  name: prometheus
+  labels:
+    prometheus: prometheus
+spec:
+  replicas: 2
+  serviceAccountName: prometheus
+  serviceMonitorSelector:
+    matchLabels:
+      team: frontend

examples/prometheus-operator/02prometheus.yaml

@@ -0,0 +1,16 @@
+apiVersion: monitoring.coreos.com/v1
+kind: Prometheus
+metadata:
+  name: prometheus
+  labels:
+    prometheus: prometheus
+spec:
+  replicas: 2
+  serviceAccountName: prometheus
+  serviceMonitorSelector:
+    matchLabels:
+      team: frontend
+  ruleSelector:
+    matchLabels:
+      role: alert-rules
+      prometheus: example

examples/prometheus-operator/03prometheus.yaml

@@ -0,0 +1,21 @@
+apiVersion: monitoring.coreos.com/v1
+kind: Prometheus
+metadata:
+  name: prometheus
+  labels:
+    prometheus: prometheus
+spec:
+  replicas: 2
+  serviceAccountName: prometheus
+  serviceMonitorSelector:
+    matchLabels:
+      team: frontend
+  alerting:
+    alertmanagers:
+    - namespace: default
+      name: alertmanager-example
+      port: web
+  ruleSelector:
+    matchLabels:
+      role: alert-rules
+      prometheus: example

examples/prometheus-operator/alertmanager-service.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: alertmanager-example
+spec:
+  type: NodePort
+  ports:
+  - name: web
+    nodePort: 30903
+    port: 9093
+    protocol: TCP
+    targetPort: web
+  selector:
+    alertmanager: example

examples/prometheus-operator/alertmanager-setup.yaml

@@ -0,0 +1,6 @@
+apiVersion: monitoring.coreos.com/v1
+kind: Alertmanager
+metadata:
+  name: example
+spec:
+  replicas: 3

examples/prometheus-operator/alertmanager-svc.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: alertmanager-example
+spec:
+  type: NodePort
+  ports:
+  - name: web
+    nodePort: 30903
+    port: 9093
+    protocol: TCP
+    targetPort: web
+  selector:
+    alertmanager: example

examples/prometheus-operator/alertmanager.yaml

@@ -0,0 +1,12 @@
+global:
+  resolve_timeout: 5m
+route:
+  group_by: ['job']
+  group_wait: 30s
+  group_interval: 5m
+  repeat_interval: 12h
+  receiver: 'webhook'
+receivers:
+- name: 'webhook'
+  webhook_configs:
+  - url: 'http://alertmanagerwh:30500/'

examples/prometheus-operator/example-app-monitor.yaml

@@ -0,0 +1,13 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: example-app
+  labels:
+    team: frontend
+    k8s-app: example-app
+spec:
+  selector:
+    matchLabels:
+      app: example-app
+  endpoints:
+  - port: web

examples/prometheus-operator/example-app.yaml

@@ -0,0 +1,30 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: example-app
+spec:
+  replicas: 3
+  template:
+    metadata:
+      labels:
+        app: example-app
+    spec:
+      containers:
+      - name: example-app
+        image: fabxc/instrumented_app
+        ports:
+        - name: web
+          containerPort: 8080
+---
+kind: Service
+apiVersion: v1
+metadata:
+  name: example-app
+  labels:
+    app: example-app
+spec:
+  selector:
+    app: example-app
+  ports:
+  - name: web
+    port: 8080

examples/prometheus-operator/example-rule.yaml

@@ -0,0 +1,13 @@
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  labels:
+    prometheus: example
+    role: alert-rules
+  name: prometheus-example-rules
+spec:
+  groups:
+  - name: ./example.rules
+    rules:
+    - alert: ExampleAlert
+      expr: vector(1)

examples/prometheus-operator/node-exporter-daemonset.yaml

@@ -0,0 +1,71 @@
+apiVersion: apps/v1beta2
+kind: DaemonSet
+metadata:
+  labels:
+    app: node-exporter
+  name: node-exporter
+spec:
+  selector:
+    matchLabels:
+      app: node-exporter
+  template:
+    metadata:
+      labels:
+        app: node-exporter
+    spec:
+      containers:
+      - args:
+        - --web.listen-address=127.0.0.1:9100
+        - --path.procfs=/host/proc
+        - --path.sysfs=/host/sys
+        image: quay.io/prometheus/node-exporter:v0.15.2
+        name: node-exporter
+        volumeMounts:
+        - mountPath: /host/proc
+          name: proc
+          readOnly: false
+        - mountPath: /host/sys
+          name: sys
+          readOnly: false
+      hostNetwork: true
+      hostPID: true
+      nodeSelector:
+        beta.kubernetes.io/os: linux
+      volumes:
+      - hostPath:
+          path: /proc
+        name: proc
+      - hostPath:
+          path: /sys
+        name: sys
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    k8s-app: node-exporter
+  name: node-exporter
+spec:
+  type: ClusterIP
+  ports:
+  - name: https
+    port: 9100
+    targetPort: https
+  selector:
+    app: node-exporter
+---
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  labels:
+    k8s-app: node-exporter
+  name: node-exporter
+spec:
+  jobLabel: k8s-app
+  endpoints:
+  - interval: 30s
+    port: https
+  selector:
+    matchLabels:
+      k8s-app: node-exporter
+