Adding HAProxy module

metricbeat/docker-compose.yml

@@ -7,6 +7,7 @@ beat:
     - nginx
     - redis
     - zookeeper
+    - haproxy
   environment:
     - APACHE_HOST=apache
     - APACHE_PORT=80
@@ -21,6 +22,8 @@ beat:
     - MYSQL_PORT=3306
     - ZOOKEEPER_HOST=zookeeper
     - ZOOKEEPER_PORT=2181
+    - HAPROXY_HOST=haproxy
+    - HAPROXY_PORT=14567
     - TEST_ENVIRONMENT=false
   working_dir: /go/src/github.com/elastic/beats/metricbeat
   volumes:
@@ -48,6 +51,9 @@ mysql:
 nginx:
   build: ${PWD}/module/nginx/_meta
 
+haproxy:
+  build: ${PWD}/module/haproxy/_meta
+
 redis:
   image: redis:3.2.0
 

metricbeat/docker-entrypoint.sh

@@ -27,4 +27,5 @@ waitFor ${MYSQL_HOST} ${MYSQL_PORT} MySQL
 waitFor ${NGINX_HOST} ${NGINX_PORT} Nginx
 waitFor ${REDIS_HOST} ${REDIS_PORT} Redis
 waitFor ${ZOOKEEPER_HOST} ${ZOOKEEPER_PORT} Zookeeper
+waitFor ${HAPROXY_HOST} ${HAPROXY_PORT} HAProxy
 exec "$@"

metricbeat/docs/fields.asciidoc

@@ -15,6 +15,7 @@ grouped in the following categories:
 * <<exported-fields-apache>>
 * <<exported-fields-beat>>
 * <<exported-fields-common>>
+* <<exported-fields-haproxy>>
 * <<exported-fields-mongodb>>
 * <<exported-fields-mysql>>
 * <<exported-fields-nginx>>
@@ -443,6 +444,34 @@ required: True
 The document type. Always set to "metricsets".
 
 
+[[exported-fields-haproxy]]
+== haproxy Fields
+
+haproxy Module
+
+
+
+[float]
+== haproxy Fields
+
+
+
+
+[float]
+== stat Fields
+
+stat
+
+
+
+[float]
+=== haproxy.stat.example
+
+type: keyword
+
+Example field
+
+
 [[exported-fields-mongodb]]
 == MongoDB Fields
 

metricbeat/docs/modules/haproxy.asciidoc

@@ -0,0 +1,37 @@
+////
+This file is generated! See scripts/docs_collector.py
+////
+
+[[metricbeat-module-haproxy]]
+== haproxy Module
+
+This is the haproxy Module.
+
+
+
+[float]
+=== Example Configuration
+
+The haproxy module supports the standard configuration options that are described
+in <<configuration-metricbeat>>. Here is an example configuration:
+
+[source,yaml]
+----
+metricbeat.modules:
+- module: haproxy
+  metricsets: ["stat"]
+  enabled: true
+  period: 1s
+  hosts: ["localhost"]
+
+----
+
+[float]
+=== Metricsets
+
+The following metricsets are available:
+
+* <<metricbeat-metricset-haproxy-stat,stat>>
+
+include::haproxy/stat.asciidoc[]
+

metricbeat/docs/modules/haproxy/stat.asciidoc

@@ -0,0 +1,19 @@
+////
+This file is generated! See scripts/docs_collector.py
+////
+
+[[metricbeat-metricset-haproxy-stat]]
+include::../../../module/haproxy/stat/_meta/docs.asciidoc[]
+
+
+==== Fields
+
+For a description of each field in the metricset, see the
+<<exported-fields-haproxy,exported fields>> section.
+
+Here is an example document generated by this metricset:
+
+[source,json]
+----
+include::../../../module/haproxy/stat/_meta/data.json[]
+----

metricbeat/etc/beat.full.yml

@@ -61,6 +61,14 @@ metricbeat.modules:
   # Password of hosts. Empty by default
   #password: test123
 
+#------------------------------- haproxy Module ------------------------------
+- module: haproxy
+  metricsets: ["stat"]
+  enabled: true
+  period: 1s
+  hosts: ["localhost"]
+
+
 #------------------------------- MongoDB Module ------------------------------
 #- module: mongodb
   #metricsets: ["status"]

metricbeat/etc/beat.yml

@@ -43,4 +43,12 @@ metricbeat.modules:
   # if true, exports the CPU usage in ticks, together with the percentage values
   cpu_ticks: false
 
+#------------------------------- haproxy Module ------------------------------
+- module: haproxy
+  metricsets: ["stat"]
+  enabled: true
+  period: 1s
+  hosts: ["localhost"]
+
+
 

metricbeat/etc/fields.yml

@@ -205,6 +205,24 @@
                   type: integer
                   description: >
                     Total.
+- key: haproxy
+  title: "haproxy"
+  description: >
+    haproxy Module
+  fields:
+    - name: haproxy
+      type: group
+      description: >
+      fields:
+        - name: stat
+          type: group
+          description: >
+            stat
+          fields:
+            - name: example
+              type: keyword
+              description: >
+                Example field
 - key: mongodb
   title: "MongoDB"
   description: >

metricbeat/include/list.go

@@ -10,6 +10,9 @@ import (
 	// This list is automatically generated by `make imports`
 	_ "github.com/elastic/beats/metricbeat/module/apache"
 	_ "github.com/elastic/beats/metricbeat/module/apache/status"
+	_ "github.com/elastic/beats/metricbeat/module/haproxy"
+	_ "github.com/elastic/beats/metricbeat/module/haproxy/info"
+	_ "github.com/elastic/beats/metricbeat/module/haproxy/stat"
 	_ "github.com/elastic/beats/metricbeat/module/mongodb"
 	_ "github.com/elastic/beats/metricbeat/module/mongodb/status"
 	_ "github.com/elastic/beats/metricbeat/module/mysql"

metricbeat/logs/metricbeat

@@ -0,0 +1,10 @@
+2016-08-10T19:06:01-04:00 INFO Metrics logging every 30s
+2016-08-10T19:06:01-04:00 INFO Loading template enabled. Reading template file: /Users/alain.lefebvre/Documents/code/github_personal/beats/metricbeat/metricbeat.template.json
+2016-08-10T19:06:01-04:00 INFO Loading template enabled for Elasticsearch 2.x. Reading template file: /Users/alain.lefebvre/Documents/code/github_personal/beats/metricbeat/metricbeat.template-es2x.json
+2016-08-10T19:06:01-04:00 INFO Elasticsearch url: http://localhost:9200
+2016-08-10T19:06:01-04:00 INFO Activated elasticsearch as output plugin.
+2016-08-10T19:06:01-04:00 INFO Publisher name: Alain-L-MBP
+2016-08-10T19:06:01-04:00 INFO Flush Interval set to: 1s
+2016-08-10T19:06:01-04:00 INFO Max Bulk Size set to: 50
+2016-08-10T19:06:01-04:00 INFO Register [ModuleFactory:[system], MetricSetFactory:[apache/status, mongodb/status, mysql/status, nginx/stubstatus, redis/info, redis/keyspace, system/core, system/cpu, system/filesystem, system/fsstat, system/load, system/memory, system/network, system/process, zookeeper/mntr]]
+2016-08-10T19:06:01-04:00 CRIT Exiting: 1 error: metricset 'haproxy/stat' is not registered, module not found

metricbeat/metricbeat.full.yml

@@ -61,6 +61,14 @@ metricbeat.modules:
   # Password of hosts. Empty by default
   #password: test123
 
+#------------------------------- haproxy Module ------------------------------
+- module: haproxy
+  metricsets: ["stat"]
+  enabled: true
+  period: 1s
+  hosts: ["localhost"]
+
+
 #------------------------------- MongoDB Module ------------------------------
 #- module: mongodb
   #metricsets: ["status"]

metricbeat/metricbeat.template-es2x.json

@@ -177,6 +177,19 @@
             }
           }
         },
+        "haproxy": {
+          "properties": {
+            "stat": {
+              "properties": {
+                "example": {
+                  "ignore_above": 1024,
+                  "index": "not_analyzed",
+                  "type": "string"
+                }
+              }
+            }
+          }
+        },
         "metricset": {
           "properties": {
             "host": {

metricbeat/metricbeat.template.json

@@ -171,6 +171,18 @@
             }
           }
         },
+        "haproxy": {
+          "properties": {
+            "stat": {
+              "properties": {
+                "example": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
         "metricset": {
           "properties": {
             "host": {

metricbeat/metricbeat.yml

@@ -36,13 +36,24 @@ metricbeat.modules:
 
     # Per process stats
     - process
-  enabled: true
+  enabled: false
   period: 10s
   processes: ['.*']
 
   # if true, exports the CPU usage in ticks, together with the percentage values
   cpu_ticks: false
 
+#------------------------------- haproxy Module ------------------------------
+- module: haproxy
+  metricsets: 
+    - "stat"
+    - "info"
+  enabled: true
+  period: 10s
+  #stats_addr: "unix:///tmp/haproxy-stats.sock"
+  stats_addr: "tcp://127.0.0.1:14567"
+
+
 
 
 #================================ General =====================================

metricbeat/module/haproxy/_meta/Dockerfile

@@ -0,0 +1,2 @@
+FROM haproxy:1.6
+COPY haproxy.conf /usr/local/etc/haproxy/haproxy.cfg

metricbeat/module/haproxy/_meta/config.full.yml

@@ -0,0 +1,11 @@
+#- module: haproxy
+
+  #metricsets: 
+    #- "stat"
+    #- "info"
+
+  #enabled: true
+
+  #period: 10s
+
+  #stats_addr: "tcp://127.0.0.1:14567

metricbeat/module/haproxy/_meta/config.yml

@@ -0,0 +1,7 @@
+- module: haproxy
+  metricsets: 
+    - "stat"
+    - "info"
+  enabled: true
+  period: 10s
+  stats_addr: "tcp://127.0.0.1:14567"

metricbeat/module/haproxy/_meta/docs.asciidoc

@@ -0,0 +1,4 @@
+== haproxy Module
+
+This is the haproxy Module.
+

metricbeat/module/haproxy/_meta/fields.yml

@@ -0,0 +1,9 @@
+- key: haproxy
+  title: "haproxy"
+  description: >
+    haproxy Module
+  fields:
+    - name: haproxy
+      type: group
+      description: >
+      fields:

metricbeat/module/haproxy/_meta/haproxy.conf

@@ -0,0 +1,39 @@
+
+global
+  # maximum number of simultaneous active connections
+  maxconn 4000
+  #daemon
+  user  root
+  group staff
+
+  # for restarts
+  pidfile /var/run/haproxy.pid
+  # Logging to syslog facility local0
+  log   127.0.0.1       local0
+  stats socket 0.0.0.0:14567
+  spread-checks 5
+  #debug
+
+defaults
+
+  log global
+  mode http
+  balance roundrobin
+  maxconn 25000
+  option httplog
+  option abortonclose
+  option httpclose
+  option forwardfor 
+  retries 3
+  option redispatch
+
+  timeout client  30s
+  timeout connect 30s
+  timeout server  30s
+  option httpchk HEAD /haproxy?monitor HTTP/1.0
+  timeout check 5s
+
+listen http-webservices 
+
+  bind 0.0.0.0:8888
+  server log1 127.0.0.1:8889 check

metricbeat/module/haproxy/doc.go

@@ -0,0 +1,4 @@
+/*
+Package haproxy is a Metricbeat module that contains MetricSets.
+*/
+package haproxy