adjust summary

yunlzheng · Oct 22, 2018 · ac0279e · ac0279e
1 parent 2550a4a
commit ac0279e
Show file tree

Hide file tree

Showing 7 changed files with 309 additions and 269 deletions.
diff --git a/PLACE_HOLDER.md b/PLACE_HOLDER.md
@@ -0,0 +1 @@
+内容正在建设中
diff --git a/README.md b/README.md
@@ -1,18 +1,26 @@
-# Prometheus操作指南
+# 目录
 
-Prometheus操作指南：云原生监控之道
+* [全书组织](Introduction.md)
 
 ## Part I - Prometheus基础
 
 * [第1章 天降奇兵](./quickstart/README.md)
   * [Prometheus简介](./quickstart/why-monitor.md)
   * [初识Prometheus](./quickstart/prometheus-quick-start.md)
+    * [安装Prometheus Server](./quickstart/install-prometheus-server.md)
+    * [使用Node Exporter采集主机数据](./quickstart/use-node-exporter.md)
+    * [监控数据可视化](./quickstart/use-grafana-create-dashboard.md)
   * [任务和实例](./quickstart/prometheus-job-and-instance.md)
   * [Prometheus核心组件](./quickstart/prometheus-architecture-and-components.md)
+  * 对比其它监控解决方案
   * [小结](./quickstart/SUMMARY.md)
 * [第2章 探索PromQL](./promql/README.md)
   * [理解时间序列](./promql/what-is-prometheus-metrics-and-labels.md)
   * [Metrics类型](./promql/prometheus-metrics-types.md)
+    * Counter计数器
+    * Gauges仪表盘
+    * Histograms桶
+    * Summaries概要
   * [初识PromQL](./promql/prometheus-query-language.md)
   * [PromQL操作符](./promql/prometheus-promql-operators-v2.md)
   * [PromQL聚合操作](./promql/prometheus-aggr-ops.md)
@@ -25,11 +33,16 @@ Prometheus操作指南：云原生监控之道
   * [自定义Prometheus告警规则](./alert/prometheus-alert-rule.md)
   * [部署AlertManager](./alert/install-alert-manager.md)
   * [基于Label的动态告警处理](./alert/alert-manager-routes.md)
-  * [使用内置告警接收器Receiver](./alert/alert-manager-with-smtp.md)
+  * [内置告警接收器Receiver](./alert/alert-manager-with-smtp.md)
+    * 集成邮件系统
+    * 集成Slack
+    * 集成微信
+    * 使用Webhook
+      * 集成企业钉钉
+    * 告警模板详解
   * [使用Webhook扩展Alertmanager](./alert/alert-manager-extension-with-webhook.md)
   * [屏蔽告警通知](./alert/alert-manager-inhibit.md)
   * [使用Recoding Rules优化性能](./alert/prometheus-recoding-rules.md)
-  * 通知模板详解
   * [小结](./alert/SUMMARY.md)
 
 ## Part II - Prometheus进阶
@@ -44,12 +57,16 @@ Prometheus操作指南：云原生监控之道
     * [使用client_java](./exporter/client_library_java.md)
     * [在Spring Boot中集成](./exporter/custom_app_support_prometheus.md)
   * [小结](./exporter/SUMMARY.md)
-* [第5章 可视化一切](./grafana/README.md)
-  * [Grafana简介](./grafana/grafana-intro.md)
-  * [使用Panel可视化监控数据](./grafana/grafana-panels.md)
-    * [变化趋势：Graph](./grafana/use_graph_panel.md)
-    * [当前状态：SingleStat](./grafana/use_singlestat_panel.md)
-    * [分布统计：使用Heatmap](./grafana/use_heatmap_panel.md)
+* [第5章 数据与可视化](./grafana/README.md)
+  * 使用Console Template
+  * [Grafana详解](./grafana/grafana-intro.md)
+    * [使用Panel可视化监控数据](./grafana/grafana-panels.md)
+      * [变化趋势：Graph面板](./grafana/use_graph_panel.md)
+      * [分布统计：Heatmap面板](./grafana/use_heatmap_panel.md)
+      * [当前状态：SingleStat面板](./grafana/use_singlestat_panel.md)
+      * [表格：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)
@@ -62,19 +79,23 @@ Prometheus操作指南：云原生监控之道
   * [Prometheus与服务发现](./sd/why-need-service-discovery.md)
   * [基于文件的服务发现](./sd/service-discovery-with-file.md)
   * [基于Consul的服务发现](./sd/service-discovery-with-consul.md)
+  * 自定义服务发现
   * [服务发现与Relabel](./sd/service-discovery-with-relabel.md)
   * [小结](./sd/SUMMARY.md)
 
 ## Part III - Prometheus实战
 
-* [第8章 使用Prometheus监控Kubernetes集群](./kubernetes/READMD.md)
+* [第8章 监控Kubernetes](./kubernetes/READMD.md)
   * [初识Kubernetes](./kubernetes/kubernetes-with-minikube.md)
   * [部署Prometheus](./kubernetes/deploy-prometheus-in-kubernetes.md)
   * [Kubernetes下的服务发现](./kubernetes/service-discovery-with-kubernetes.md)
   * [监控Kubernetes集群](./kubernetes/use-prometheus-monitor-kubernetes.md)
   * [使用Grafana创建可视化仪表盘](./kubernetes/use-grafana-in-k8s.md)
+  * [基于Prometheus的弹性伸缩](./kubernetes/hap-with-prometheus.md)
+  * [小结](./kubernetes/SUMMARY.md)
+* 第9章 Prometheus Operator
   * [使用Opertor管理Prometheus](./kubernetes/use-operator-manage-prometheus.md)
-    * [使用Prometheus Operator监控用户应用](./kubernetes/use-operator-monitor-app.md)
-    * [使用Prometheus Operator管理Alertmanager](./kubernetes/use-operator-alerting.md)
-* [第9章 使用Prometheus监控Rancher集群](./rancher/README.md)
+  * [使用Prometheus Operator监控用户应用](./kubernetes/use-operator-monitor-app.md)
+  * [使用Prometheus Operator管理Alertmanager](./kubernetes/use-operator-alerting.md)
+* [第10章 使用Prometheus监控Rancher集群](./rancher/README.md)
 * [参考资料](./REFERENCES.md)
diff --git a/SUMMARY.md b/SUMMARY.md
@@ -7,12 +7,20 @@
 * [第1章 天降奇兵](./quickstart/README.md)
   * [Prometheus简介](./quickstart/why-monitor.md)
   * [初识Prometheus](./quickstart/prometheus-quick-start.md)
+    * [安装Prometheus Server](./quickstart/install-prometheus-server.md)
+    * [使用Node Exporter采集主机数据](./quickstart/use-node-exporter.md)
+    * [监控数据可视化](./quickstart/use-grafana-create-dashboard.md)
   * [任务和实例](./quickstart/prometheus-job-and-instance.md)
   * [Prometheus核心组件](./quickstart/prometheus-architecture-and-components.md)
+  * 对比其它监控解决方案
   * [小结](./quickstart/SUMMARY.md)
 * [第2章 探索PromQL](./promql/README.md)
   * [理解时间序列](./promql/what-is-prometheus-metrics-and-labels.md)
   * [Metrics类型](./promql/prometheus-metrics-types.md)
+    * Counter计数器
+    * Gauges仪表盘
+    * Histograms桶
+    * Summaries概要
   * [初识PromQL](./promql/prometheus-query-language.md)
   * [PromQL操作符](./promql/prometheus-promql-operators-v2.md)
   * [PromQL聚合操作](./promql/prometheus-aggr-ops.md)
@@ -26,6 +34,12 @@
   * [部署AlertManager](./alert/install-alert-manager.md)
   * [基于Label的动态告警处理](./alert/alert-manager-routes.md)
   * [内置告警接收器Receiver](./alert/alert-manager-with-smtp.md)
+    * 集成邮件系统
+    * 集成Slack
+    * 集成微信
+    * 使用Webhook
+      * 集成企业钉钉
+    * 告警模板详解
   * [使用Webhook扩展Alertmanager](./alert/alert-manager-extension-with-webhook.md)
   * [屏蔽告警通知](./alert/alert-manager-inhibit.md)
   * [使用Recoding Rules优化性能](./alert/prometheus-recoding-rules.md)
@@ -43,15 +57,16 @@
     * [使用client_java](./exporter/client_library_java.md)
     * [在Spring Boot中集成](./exporter/custom_app_support_prometheus.md)
   * [小结](./exporter/SUMMARY.md)
-* [第5章 可视化一切](./grafana/README.md)
-  * [Grafana简介](./grafana/grafana-intro.md)
-  * [使用Panel可视化监控数据](./grafana/grafana-panels.md)
-    * [变化趋势：Graph面板](./grafana/use_graph_panel.md)
-    * [分布统计：Heatmap面板](./grafana/use_heatmap_panel.md)
-    * [当前状态：SingleStat面板](./grafana/use_singlestat_panel.md)
-    * [表格：Tabel面板](./grafana/use_table_panel.md)
-  * [模板化Dashboard](./grafana/templating.md)
-  * [共享Dashboard](./grafana/share_dashboard.md)
+* [第5章 数据与可视化](./grafana/README.md)
+  * 使用Console Template
+  * [Grafana详解](./grafana/grafana-intro.md)
+    * [使用Panel可视化监控数据](./grafana/grafana-panels.md)
+      * [变化趋势：Graph面板](./grafana/use_graph_panel.md)
+      * [分布统计：Heatmap面板](./grafana/use_heatmap_panel.md)
+      * [当前状态：SingleStat面板](./grafana/use_singlestat_panel.md)
+      * [表格：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)
@@ -64,21 +79,23 @@
   * [Prometheus与服务发现](./sd/why-need-service-discovery.md)
   * [基于文件的服务发现](./sd/service-discovery-with-file.md)
   * [基于Consul的服务发现](./sd/service-discovery-with-consul.md)
+  * 自定义服务发现
   * [服务发现与Relabel](./sd/service-discovery-with-relabel.md)
   * [小结](./sd/SUMMARY.md)
 
 ## Part III - Prometheus实战
 
-* [第8章 使用Prometheus监控Kubernetes集群](./kubernetes/READMD.md)
+* [第8章 监控Kubernetes](./kubernetes/READMD.md)
   * [初识Kubernetes](./kubernetes/kubernetes-with-minikube.md)
   * [部署Prometheus](./kubernetes/deploy-prometheus-in-kubernetes.md)
   * [Kubernetes下的服务发现](./kubernetes/service-discovery-with-kubernetes.md)
   * [监控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/use-operator-monitor-app.md)
-    * [使用Prometheus Operator管理Alertmanager](./kubernetes/use-operator-alerting.md)
   * [基于Prometheus的弹性伸缩](./kubernetes/hap-with-prometheus.md)
   * [小结](./kubernetes/SUMMARY.md)
-* [第9章 使用Prometheus监控Rancher集群](./rancher/README.md)
+* 第9章 Prometheus Operator
+  * [使用Opertor管理Prometheus](./kubernetes/use-operator-manage-prometheus.md)
+  * [使用Prometheus Operator监控用户应用](./kubernetes/use-operator-monitor-app.md)
+  * [使用Prometheus Operator管理Alertmanager](./kubernetes/use-operator-alerting.md)
+* [第10章 使用Prometheus监控Rancher集群](./rancher/README.md)
 * [参考资料](./REFERENCES.md)
diff --git a/quickstart/install-prometheus-server.md b/quickstart/install-prometheus-server.md
@@ -0,0 +1,81 @@
+## 安装Prometheus Server
+
+Prometheus基于Golang编写，编译后的软件包，不依赖于任何的第三方依赖。用户只需要下载对应平台的二进制包，解压并且添加基本的配置即可正常启动Prometheus Server。
+
+### 从二进制包安装
+
+对于非Docker用户，可以从[https://prometheus.io/download/](https://prometheus.io/download/)找到最新版本的Prometheus Sevrer软件包：
+
+```
+export VERSION=2.4.3
+curl -LO  https://github.com/prometheus/prometheus/releases/download/$VERSION/prometheus-$VERSION.darwin-amd64.tar.gz
+```
+
+解压，并将Prometheus相关的命令，添加到系统环境变量路径即可：
+
+```
+tar -xzf prometheus-${VERSION}.darwin-amd64.tar.gz
+cp prometheus-${VERSION}.darwin-amd64/prometheus /usr/local/bin/
+cp prometheus-${VERSION}.darwin-amd64/promtool /usr/local/bin/
+
+sudo mkdir -p /data/prometheus
+```
+
+解压后当前目录会包含默认的Prometheus配置文件promethes.yml，拷贝配置文件到/etc/prometheus/prometheus.yml:
+
+```
+global:
+  scrape_interval:     15s # Set the scrape interval to every 15 seconds. Default is every 1 minute.
+  evaluation_interval: 15s # Evaluate rules every 15 seconds. The default is every 1 minute.
+  # scrape_timeout is set to the global default (10s).
+
+# Alertmanager configuration
+alerting:
+  alertmanagers:
+  - static_configs:
+    - targets:
+      # - alertmanager:9093
+
+# Load rules once and periodically evaluate them according to the global 'evaluation_interval'.
+rule_files:
+  # - "first_rules.yml"
+  # - "second_rules.yml"
+
+# A scrape configuration containing exactly one endpoint to scrape:
+# Here it's Prometheus itself.
+scrape_configs:
+  # The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.
+  - job_name: 'prometheus'
+
+    # metrics_path defaults to '/metrics'
+    # scheme defaults to 'http'.
+
+    static_configs:
+      - targets: ['localhost:9090']
+```
+
+启动prometheus服务：
+
+```
+prometheus --config.file=/etc/prometheus/prometheus.yml --storage.tsdb.path=/data/prometheus
+```
+
+正常的情况下，你可以看到以下输出内容：
+
+```
+msg="Loading configuration file" filename=/etc/prometheus/prometheus.yml
+level=info ts=2018-03-11T13:38:06.317645234Z caller=main.go:486 msg="Server is ready to receive web requests."
+level=info ts=2018-03-11T13:38:06.317679086Z caller=manager.go:59 component="scrape manager" msg="Starting scrape manager..."
+```
+
+### 使用容器安装
+
+对于Docker用户，直接使用Prometheus的镜像即可启动Prometheus Server：
+
+```
+docker run -p 9090:9090 -v /etc/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml prom/prometheus
+```
+
+启动完成后，可以通过[http://localhost:9090](http://localhost:9090)访问Prometheus的UI界面：
+
+![Prometheus UI](./static/prometheus-ui-graph.png)