From bd8d6ac6b501528f56be9a6cf4663e271e194e44 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Wed, 28 Sep 2016 11:50:19 +0200
Subject: [PATCH] =?UTF-8?q?ELK/Elasticsearch:=20retrait=20de=20mentions=20?=
 =?UTF-8?q?=C3=A0=20Git=20et=20apt=20update?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HowtoELK.md           | 15 +++------------
 HowtoElasticsearch.md | 13 ++++++-------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/HowtoELK.md b/HowtoELK.md
index 8e738c01..3c660cf0 100644
--- a/HowtoELK.md
+++ b/HowtoELK.md
@@ -17,7 +17,7 @@ Elasticsearch est un serveur de base de donnée qui dispose d'une interface REST
 ~~~
 # wget -qO - https://packages.elastic.co/GPG-KEY-elasticsearch | apt-key add -
 # echo "deb http://packages.elastic.co/elasticsearch/2.x/debian stable main" | tee -a /etc/apt/sources.list.d/elastic.list
-# apt update && apt install elasticsearch openjdk-7-jre openjdk-7-jre-headless
+# apt install elasticsearch openjdk-7-jre openjdk-7-jre-headless
 ~~~
 
 ## Configuration de base
@@ -47,10 +47,6 @@ Plus détails sur la bonne configuration d'Elasticsearch sont sur [HowtoElasticS
 # chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/plugins/
 ~~~
 
-~~~
-# cd /etc; git add -A; git commit -m "Install Elasticsearch"
-~~~
-
 ## Démarrage
 
 ~~~
@@ -80,8 +76,7 @@ Documentation officielle : <https://www.elastic.co/guide/en/logstash/2.4/index.h
 
 ~~~
 # echo "deb http://packages.elastic.co/logstash/2.4/debian stable main" | tee -a /etc/apt/sources.list.d/elastic.list
-# apt update && apt install logstash
-# cd /etc; git add -A; git commit -m "Install Logstash"
+# apt install logstash
 ~~~
 
 Dans `/etc/default/logstash` il faut penser à ajuster la ram allouée.
@@ -112,7 +107,7 @@ Documentation officielle : <https://www.elastic.co/guide/en/kibana/4.6/index.htm
 
 ~~~
 # echo "deb http://packages.elastic.co/kibana/4.6/debian stable main" | tee -a /etc/apt/sources.list.d/elastic.list
-# apt update && apt install kibana
+# apt install kibana
 # /opt/kibana/bin/kibana plugin --install elastic/sense
 # chown -R kibana: /opt/kibana
 ~~~
@@ -130,10 +125,6 @@ Documentation officielle : <https://www.elastic.co/guide/en/kibana/4.6/index.htm
 }
 ~~~
 
-~~~
-# cd /etc; git add -A; git commit -m "Install Kibana"
-~~~
-
 ## Démarrage
 
 ~~~
diff --git a/HowtoElasticsearch.md b/HowtoElasticsearch.md
index 3b968152..0578b0e2 100644
--- a/HowtoElasticsearch.md
+++ b/HowtoElasticsearch.md
@@ -17,7 +17,6 @@ Nous utilisons les paquets Debian distribués par Elasticsearch, les paquets off
 ~~~
 # echo "deb http://packages.elastic.co/elasticsearch/2.x/debian stable main" | tee -a /etc/apt/sources.list.d/elasticsearch-2.x.list
 # wget -qO - https://packages.elastic.co/GPG-KEY-elasticsearch | apt-key add -
-# apt update
 # apt install elasticsearch openjdk-7-jre
 ~~~
 
@@ -263,7 +262,7 @@ curl localhost:9200/planet/hacker/1?pretty=true
 Mise à jour du champ âge.
 
 ~~~
-curl -X POST localhost:9200/planet/hacker/1/_update -d @- <<< '{"doc": {"age": 19}}'
+curl -X POST localhost:9200/planet/hacker/1/_update -d '{"doc": {"age": 19}}'
 ~~~
 
 Suppression du document.
@@ -281,7 +280,7 @@ curl -X DELETE localhost:9200/planet
 ~~~
 
 ~~~
-curl -X PUT localhost:9200/planet -d @- <<< '
+curl -X PUT localhost:9200/planet -d '
 {
     "mappings": {
         "hacker": {
@@ -303,21 +302,21 @@ curl -X PUT localhost:9200/planet -d @- <<< '
 Ajoutons quelques documents.
 
 ~~~
-curl -X PUT localhost:9200/planet/hacker/1 -d @- <<< '
+curl -X PUT localhost:9200/planet/hacker/1 -d '
 {
     "handle": "mark",
     "hobbies": ["rollerblading", "hacking", "coding"]
 }
 '
 
-curl -X PUT localhost:9200/planet/hacker/2 -d @- <<< '
+curl -X PUT localhost:9200/planet/hacker/2 -d '
 {
     "handle": "gondry",
     "hobbies": ["writing", "skateboarding"]
 }
 '
 
-curl -X PUT localhost:9200/planet/hacker/3 -d @- <<< '
+curl -X PUT localhost:9200/planet/hacker/3 -d '
 {
     "handle": "jean-michel",
     "hobbies": ["coding", "rollerblades"]
@@ -328,7 +327,7 @@ curl -X PUT localhost:9200/planet/hacker/3 -d @- <<< '
 Recherchons ceux qui ont pour hobby « rollerblading ».
 
 ~~~
-curl -X POST localhost:9200/planet/hacker/_search?pretty=true -d @- <<< '
+curl -X POST localhost:9200/planet/hacker/_search?pretty=true -d '
 {
     "query": {
         "match": {