Backport 5.0: Fix haproxy index template (elastic#2565)

- Add test case for haproxy schema. - Remove haproxy stats_addr option because hosts is the standard option used across modules. Closes elastic#2561 elastic#2563
tsg · Sep 16, 2016 · d55a6ba · d55a6ba
1 parent bf07ba7
commit d55a6ba
Show file tree

Hide file tree

Showing 15 changed files with 214 additions and 203 deletions.
diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -626,71 +626,71 @@ type: integer
 [float]
 == max Fields
 
-
+Maximum values reported by HAProxy.
 
 
 [float]
 === haproxy.info.max.hard_conn
 
 type: integer
 
-
+HardMaxconn
 
 [float]
-=== haproxy.info.max.sock
+=== haproxy.info.max.ssl.conns
 
 type: integer
 
-
+MaxSslConns
 
 [float]
-=== haproxy.info.max.conn
+=== haproxy.info.max.ssl.rate
 
 type: integer
 
-
+MaxSslRate
 
 [float]
-=== haproxy.info.max.ssl_conns
+=== haproxy.info.max.sock
 
 type: integer
 
-
+Maxsock
 
 [float]
-=== haproxy.info.max.pipes
+=== haproxy.info.max.conn.value
 
 type: integer
 
-
+Maxconn
 
 [float]
-=== haproxy.info.max.conn_rate
+=== haproxy.info.max.conn.rate
 
 type: integer
 
-
+MaxConnRate
 
 [float]
 === haproxy.info.max.sess_rate
 
 type: integer
 
-
+MaxSessRate
 
 [float]
-=== haproxy.info.max.ssl_rate
+=== haproxy.info.max.pipes
 
 type: integer
 
-
+Maxpipes
 
 [float]
 === haproxy.info.max.zlib_mem_usage
 
 type: integer
 
-
+MaxZlibMemUsage
 
 [float]
 == pipes Fields
@@ -812,14 +812,14 @@ type: integer
 
 
 [float]
-=== haproxy.info.ssl.ssl_cached_lookups
+=== haproxy.info.ssl.cached_lookups
 
 type: integer
 
 
 
 [float]
-=== haproxy.info.ssl.ssl_cache_misses
+=== haproxy.info.ssl.cache_misses
 
 type: integer
 

diff --git a/metricbeat/docs/modules/haproxy.asciidoc b/metricbeat/docs/modules/haproxy.asciidoc
@@ -24,12 +24,10 @@ in <<configuration-metricbeat>>. Here is an example configuration:
 ----
 metricbeat.modules:
 - module: haproxy
-  metricsets: 
-    - "stat"
-    - "info"
+  metricsets: [stat, info]
   enabled: true
   period: 10s
-  stats_addr: "tcp://127.0.0.1:14567"
+  hosts: ['tcp://127.0.0.1:14567']
 ----
 
 [float]

diff --git a/metricbeat/etc/beat.full.yml b/metricbeat/etc/beat.full.yml
@@ -69,13 +69,10 @@ metricbeat.modules:
 
 #------------------------------- haproxy Module ------------------------------
 #- module: haproxy
-  #metricsets:
-    #- "stat"
-    #- "info"
-
+  #metricsets: [stat, info]
   #enabled: true
   #period: 10s
-  #stats_addr: "tcp://127.0.0.1:14567
+  #hosts: ['tcp://127.0.0.1:14567']
 
 #------------------------------- MongoDB Module ------------------------------
 #- module: mongodb

diff --git a/metricbeat/etc/fields.yml b/metricbeat/etc/fields.yml
@@ -293,33 +293,33 @@
                     - name: value
                       type: integer
                       description: >
-          
+
                     - name: limit
                       type: integer
                       description: >
 
             - name: curr
               type: group
               description: >
-      
+
               fields:
                 - name: conns
                   type: integer
                   description: >
-            
+
                 - name: ssl_conns
                   type: integer
                   description: >
 
             - name: cum
               type: group
               description: >
-      
+
               fields:
                 - name: conns
                   type: integer
                   description: >
-            
+
                 - name: req
                   type: integer
                   description: >
@@ -331,63 +331,62 @@
 
             - name: max
               type: group
-              description: >
+              description: Maximum values reported by HAProxy.
 
               fields:
                 - name: hard_conn
                   type: integer
-                  description: >
+                  description: HardMaxconn
 
-                - name: sock
+                - name: ssl.conns
                   type: integer
-                  description: >     
-      
-                - name: conn
+                  description: MaxSslConns
+
+                - name: ssl.rate
                   type: integer
-                  description: >
+                  description: MaxSslRate
 
-                - name: ssl_conns
+                - name: sock
                   type: integer
-                  description: >
+                  description: Maxsock
 
-                - name: pipes
+                - name: conn.value
                   type: integer
-                  description: >
+                  description: Maxconn
 
-                - name: conn_rate
+                - name: conn.rate
                   type: integer
-                  description: >
-        
+                  description: MaxConnRate
+
                 - name: sess_rate
                   type: integer
-                  description: >
+                  description: MaxSessRate
 
-                - name: ssl_rate
+                - name: pipes
                   type: integer
-                  description: >
+                  description: Maxpipes
 
                 - name: zlib_mem_usage
                   type: integer
-                  description: >
+                  description: MaxZlibMemUsage
 
             - name: pipes
               type: group
               description: >
-      
+
               fields:
                 - name: used
                   type: integer
                   description: >
-            
+
                 - name: free
                   type: integer
                   description: >
 
-
             - name: sess
               type: group
               description: >
-      
+
               fields:
                 - name: rate
                   type: group
@@ -405,12 +404,12 @@
             - name: ssl
               type: group
               description: >
-      
+
               fields:
                 - name: rate
                   type: group
                   description: >
-          
+
                   fields:
                     - name: value
                       type: integer
@@ -423,7 +422,7 @@
                 - name: frontend
                   type: group
                   description: >
-          
+
                   fields:
                     - name: key_rate
                       type: integer
@@ -440,7 +439,7 @@
                 - name: backend
                   type: group
                   description: >
-          
+
                   fields:
                     - name: key_rate
                       type: integer
@@ -450,11 +449,11 @@
                       type: integer
                       description: >
 
-                - name: ssl_cached_lookups
+                - name: cached_lookups
                   type: integer
                   description: >
 
-                - name: ssl_cache_misses
+                - name: cache_misses
                   type: integer
                   description: >
 

diff --git a/metricbeat/etc/kibana/index-pattern/metricbeat.json b/metricbeat/etc/kibana/index-pattern/metricbeat.json
diff --git a/metricbeat/metricbeat.full.yml b/metricbeat/metricbeat.full.yml
@@ -69,13 +69,10 @@ metricbeat.modules:
 
 #------------------------------- haproxy Module ------------------------------
 #- module: haproxy
-  #metricsets:
-    #- "stat"
-    #- "info"
-
+  #metricsets: [stat, info]
   #enabled: true
   #period: 10s
-  #stats_addr: "tcp://127.0.0.1:14567
+  #hosts: ['tcp://127.0.0.1:14567']
 
 #------------------------------- MongoDB Module ------------------------------
 #- module: mongodb

diff --git a/metricbeat/metricbeat.template-es2x.json b/metricbeat/metricbeat.template-es2x.json
@@ -244,10 +244,14 @@
                 "max": {
                   "properties": {
                     "conn": {
-                      "type": "long"
-                    },
-                    "conn_rate": {
-                      "type": "long"
+                      "properties": {
+                        "rate": {
+                          "type": "long"
+                        },
+                        "value": {
+                          "type": "long"
+                        }
+                      }
                     },
                     "hard_conn": {
                       "type": "long"
@@ -261,11 +265,15 @@
                     "sock": {
                       "type": "long"
                     },
-                    "ssl_conns": {
-                      "type": "long"
-                    },
-                    "ssl_rate": {
-                      "type": "long"
+                    "ssl": {
+                      "properties": {
+                        "conns": {
+                          "type": "long"
+                        },
+                        "rate": {
+                          "type": "long"
+                        }
+                      }
                     },
                     "zlib_mem_usage": {
                       "type": "long"
@@ -323,6 +331,12 @@
                         }
                       }
                     },
+                    "cache_misses": {
+                      "type": "long"
+                    },
+                    "cached_lookups": {
+                      "type": "long"
+                    },
                     "frontend": {
                       "properties": {
                         "key_rate": {
@@ -345,12 +359,6 @@
                           "type": "long"
                         }
                       }
-                    },
-                    "ssl_cache_misses": {
-                      "type": "long"
-                    },
-                    "ssl_cached_lookups": {
-                      "type": "long"
                     }
                   }
                 },