Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding HAProxy module #2384

Merged
merged 23 commits into from Sep 8, 2016
Merged
Changes from 21 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
8c236c4
Merge pull request #1 from elastic/master
hartfordfive Jun 15, 2016
5b4adac
Merge pull request #2 from elastic/master
hartfordfive Jul 27, 2016
056f7f8
Committing current work for haproxy module
hartfordfive Aug 11, 2016
7b4c97d
Committing current changes.
hartfordfive Aug 13, 2016
8d9d696
Added haproxy package to fetch stat/info commands
hartfordfive Aug 16, 2016
dcf16a8
Updated stat/info metrics
hartfordfive Aug 16, 2016
16dafbe
Comitting current changes
hartfordfive Aug 21, 2016
ac6dbe1
Committing current changes
hartfordfive Aug 21, 2016
543319e
Updated necessary test related files
hartfordfive Aug 21, 2016
52652bf
Committing current changes
hartfordfive Aug 24, 2016
eb7c22d
Committing current changes
hartfordfive Aug 24, 2016
6c0eb6f
Fixed errors & small changes
hartfordfive Aug 27, 2016
e2828a8
Minor fixes
hartfordfive Aug 27, 2016
3e4384e
Fixed field names/values & removed unused function
hartfordfive Aug 29, 2016
004d9fa
Updated filebeat configs
hartfordfive Aug 29, 2016
007d4a4
Comitting curent changes
hartfordfive Aug 31, 2016
ef9c877
Merging in master & fixing conflicts
hartfordfive Sep 1, 2016
498ada4
Applied changes as per comments
hartfordfive Sep 2, 2016
e989718
Updated structure to follow event convetions
hartfordfive Sep 3, 2016
41eb385
Updated index templates
hartfordfive Sep 4, 2016
607c564
Fixed index templates and data type
hartfordfive Sep 4, 2016
6ba4fbd
Removed unecessary Sprintf & added experimental warning
hartfordfive Sep 5, 2016
e768cd2
Restored original version of file
hartfordfive Sep 7, 2016
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

@@ -2,4 +2,4 @@ build

/metricbeat
/metricbeat.test
/docs/html_docs
/docs/html_docs
@@ -9,6 +9,7 @@ beat:
- postgresql
- redis
- zookeeper
- haproxy
environment:
- APACHE_HOST=apache
- APACHE_PORT=80
@@ -28,6 +29,8 @@ beat:
- POSTGRESQL_PORT=5432
- 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:
@@ -58,6 +61,9 @@ mysql:
nginx:
build: ${PWD}/module/nginx/_meta

haproxy:
build: ${PWD}/module/haproxy/_meta

postgresql:
image: postgres:9.5.3

@@ -29,4 +29,5 @@ waitFor ${NGINX_HOST} ${NGINX_PORT} Nginx
waitFor ${POSTGRESQL_HOST} ${POSTGRESQL_PORT} Postgresql
waitFor ${REDIS_HOST} ${REDIS_PORT} Redis
waitFor ${ZOOKEEPER_HOST} ${ZOOKEEPER_PORT} Zookeeper
waitFor ${HAPROXY_HOST} ${HAPROXY_PORT} HAProxy
exec "$@"
@@ -16,6 +16,7 @@ grouped in the following categories:
* <<exported-fields-beat>>
* <<exported-fields-beats>>
* <<exported-fields-common>>
* <<exported-fields-haproxy>>
* <<exported-fields-mongodb>>
* <<exported-fields-mysql>>
* <<exported-fields-nginx>>
@@ -699,6 +700,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

@@ -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[]

@@ -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[]
----
@@ -67,6 +67,15 @@ metricbeat.modules:
# Password of hosts. Empty by default
#password: test123

#------------------------------- haproxy Module ------------------------------
#- module: haproxy
#metricsets:
#- "stat"
#- "info"
#enabled: true
#period: 10s
#stats_addr: "tcp://127.0.0.1:14567

#-------------------------------- beats Module -------------------------------
#- module: beats
#metricsets: ["filebeat", "libbeat"]
@@ -43,4 +43,6 @@ metricbeat.modules:
period: 10s
processes: ['.*']

# if true, exports the CPU usage in ticks, together with the percentage values

This comment has been minimized.

Copy link
@ruflin

ruflin Sep 5, 2016

Collaborator

Not sure how this change neded up in this PR?

This comment has been minimized.

Copy link
@hartfordfive

hartfordfive Sep 5, 2016

Author Contributor

I believe I got these changes when merging in the latest master the other day into my branch.

This comment has been minimized.

Copy link
@ruflin

ruflin Sep 6, 2016

Collaborator

Does not seem to be in master: https://github.com/elastic/beats/blob/master/metricbeat/etc/beat.yml Could you run git checkout master metricbeat/etc/beat.yml ?

cpu_ticks: false

ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.