Merge pull request #16 from onebirdrocks/master

更新

part-4/14.5-用ELK进行日志管理/README.md

@@ -0,0 +1,17 @@
+# 用 ELK 来做日志管理
+## 课程demo
+```
+./filebeat modules list
+./filebeat modules enable system
+./filebeat modules enable elasticsearch
+
+
+## 进 modules.d 编辑相应的文件，修改log路径
+
+./filebeat setup –dashboards
+
+./filebeat export template | more
+
+./filebeat -e
+
+```

part-4/14.6-用Canvas做数据演示/README.md

@@ -0,0 +1,12 @@
+POST elasticoffee/_search
+{
+  "size": 0, 
+  "aggs": {
+    "by": {
+      "terms": {
+        "field": "beverage.keyword",
+        "size": 10
+      }
+    }
+  }
+}

part-5/备战Elastic认证/backup_restore/README.md → part-5/backup_restore/README.md

@@ -1,6 +1,11 @@
 # 集群Backup & Restore
 ## 课程demo
 ```
+
+#在 elasticsearch.yml 加入相关的配置
+path.repo: ["/Users/yiruan/geektime/mount/my_backup"]
+
+#创建一个 repositoty
 PUT /_snapshot/my_fs_backup
 {
     "type": "fs",
@@ -10,18 +15,44 @@ PUT /_snapshot/my_fs_backup
     }
 }
 
+# 创建一个snapshot
+PUT /_snapshot/my_fs_backup/snapshot_1?wait_for_completion=true
 
-PUT /_snapshot/my_fs_backup/snapshot_5?wait_for_completion=true
-DELETE /_snapshot/my_fs_backup/snapshot_2
+DELETE test
+PUT test/_doc/1
+{
+  "key":"value1"
+}
+
+
+#指定索引创建快照
+PUT /_snapshot/my_fs_backup/snapshot_2?wait_for_completion=true
+{
+  "indices": "test",
+  "ignore_unavailable": true,
+  "include_global_state": false,
+  "metadata": {
+    "taken_by": "yiming",
+    "taken_because": "backup before upgrading"
+  }
+}
 
+#查看所有的快照
 GET /_snapshot/my_fs_backup/_all
 
-GET /_snapshot/my_fs_backup/_current
+# 删除快照
+DELETE /_snapshot/my_fs_backup/snapshot_2
 
 
 POST /_snapshot/my_fs_backup/snapshot_1/_restore
 {
-  "indices": "testxxx",
+  
+}
+
+# 指定索引进行 restore
+POST /_snapshot/my_fs_backup/snapshot_1/_restore
+{
+  "indices": "test",
   "index_settings": {
     "index.number_of_replicas": 5
   },
@@ -30,21 +61,11 @@ POST /_snapshot/my_fs_backup/snapshot_1/_restore
   ]
 }
 
-GET testxxx/_settings
+DELETE test
 
-DELETE testxxx
+# 删除快照
+DELETE /_snapshot/my_fs_backup
 
-GET testxxx
 
-PUT /_snapshot/my_fs_backup/snapshot_3?wait_for_completion=true
-{
-  "indices": "testxxx",
-  "ignore_unavailable": true,
-  "include_global_state": false,
-  "metadata": {
-    "taken_by": "yiming",
-    "taken_because": "backup before upgrading"
-  }
-}
 
 ```