Cleanup metricbeat configuration (#1383)

elastic · Apr 19, 2016 · 02cf206 · 02cf206
1 parent 79bd08a
commit 02cf206
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/metricbeat/etc/beat.yml b/metricbeat/etc/beat.yml
@@ -2,13 +2,13 @@ metricbeat:
   modules:
 
     # Apache Module
-    # Server-status page (/server-status) is configurable string in apache and
-    # must be defined by user
     - module: apache
       metricsets: ["status"]
-      hosts: ["http://127.0.0.1/"]
-      period: 1s
       enabled: true
+      period: 1s
+
+      # Apache hosts
+      hosts: ["http://127.0.0.1/"]
 
       # Path to server status. Default server-status
       #server_status_path: "server-status"
@@ -22,7 +22,10 @@ metricbeat:
     # Redis Module
     - module: redis
       metricsets: ["info"]
+      enabled: true
       period: 1s
+
+      # Redis hosts
       hosts: ["127.0.0.1:6379"]
 
       # Enabled defines if the module is enabled. Default: true

diff --git a/metricbeat/metricbeat.yml b/metricbeat/metricbeat.yml
@@ -2,13 +2,13 @@ metricbeat:
   modules:
 
     # Apache Module
-    # Server-status page (/server-status) is configurable string in apache and
-    # must be defined by user
     - module: apache
       metricsets: ["status"]
-      hosts: ["http://127.0.0.1/"]
-      period: 1s
       enabled: true
+      period: 1s
+
+      # Apache hosts
+      hosts: ["http://127.0.0.1/"]
 
       # Path to server status. Default server-status
       #server_status_path: "server-status"
@@ -22,7 +22,10 @@ metricbeat:
     # Redis Module
     - module: redis
       metricsets: ["info"]
+      enabled: true
       period: 1s
+
+      # Redis hosts
       hosts: ["127.0.0.1:6379"]
 
       # Enabled defines if the module is enabled. Default: true