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

Adds a couchbase module for metricbeat #3081

Merged
merged 46 commits into from
Dec 15, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
ee5986c
adds initial couchbase module with host metricset
paschdan Nov 28, 2016
26532dc
adds host informtion
paschdan Nov 28, 2016
ef6d266
adds initial node metricset
paschdan Nov 28, 2016
64c3b4a
rename mapping function
paschdan Nov 28, 2016
e9fb8d5
remove not relevant data from datamapping for host
paschdan Nov 28, 2016
e9ac84c
add node metrics for couchbase
paschdan Nov 28, 2016
9eb34fc
reorder host metrics
paschdan Nov 28, 2016
3e54698
rename host to cluster
paschdan Nov 28, 2016
a8560a5
adds initial bucket metricset to couchbase
paschdan Nov 28, 2016
1cc6c86
adds basic bucket stats
paschdan Nov 28, 2016
bb443be
add integration test for couchbase/bucket metricset
paschdan Nov 29, 2016
9e923d1
adds unittest for bucket metricset
paschdan Nov 29, 2016
8c24116
adds unittest for node metrics
paschdan Nov 29, 2016
430b50d
adds generated data.json for node metricset
paschdan Nov 29, 2016
c9501e4
adds generated data.json for couchbase metricsets
paschdan Nov 29, 2016
b0a1c54
adds unit- and integration tests to cluster metricset
paschdan Nov 29, 2016
13bdd86
remove wrong and unecessary comments
paschdan Nov 29, 2016
58983c3
fix style according to gofmt
paschdan Nov 29, 2016
87b7ebc
update meta data
paschdan Nov 30, 2016
248c494
add fields to cluster metricset
paschdan Nov 30, 2016
0951671
add fields to node metricset
paschdan Nov 30, 2016
2d083d6
update asciidoc
paschdan Nov 30, 2016
a0429e8
correct datatypes in fields
paschdan Nov 30, 2016
d2f577a
update docs and fields
paschdan Nov 30, 2016
f42f4eb
make couchbase container configuration faster
paschdan Nov 30, 2016
771708f
use int64 for bucket metrics to allow higher numbers
paschdan Nov 30, 2016
d3ee4ba
use naming conventions for bucket metrics
paschdan Dec 6, 2016
17fee81
use naming conventions for cluster metrics
paschdan Dec 6, 2016
cdb5308
use naming conventions for node metrics
paschdan Dec 7, 2016
5a30371
update data.json in metadata with new fieldnames
paschdan Dec 7, 2016
c5e1f17
update templates and docs
paschdan Dec 7, 2016
9ed7f2c
sort service awaits alphabetically
paschdan Dec 9, 2016
50dee5f
pin couchbase to 4.5.1
paschdan Dec 9, 2016
27cff5b
restructure imports
paschdan Dec 9, 2016
01c01cb
reformat resulting message to use nested fields in bucket metric set
paschdan Dec 9, 2016
a467371
flag module as experimental
paschdan Dec 9, 2016
c1bd992
reformat resulting message to use nested fields in cluster metricset
paschdan Dec 9, 2016
3a7d836
update metadata with new fields
paschdan Dec 9, 2016
8dcf4cd
reformat resulting message to use nested fields in node metricset
paschdan Dec 9, 2016
533acf9
update metadata with new fields
paschdan Dec 9, 2016
e21bdb6
update metadata after rebase
paschdan Dec 13, 2016
667165c
nest formats in bucket metricset
paschdan Dec 13, 2016
c6a75c2
nest formats in cluster metricset
paschdan Dec 13, 2016
899f3d6
nest formats in node metricset
paschdan Dec 13, 2016
82aae5c
update metadata
paschdan Dec 13, 2016
532772b
adds couchbase module to Changelog
paschdan Dec 13, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ https://github.com/elastic/beats/compare/v5.1.1...master[Check the HEAD diff]

*Metricbeat*
- Kafka module broker matching enhancements. {pull}3129[3129]
- Add a couchbase module with metricsets for node, cluster and bucker. {pull}3081[3081]


*Packetbeat*
Expand Down
7 changes: 7 additions & 0 deletions metricbeat/_meta/beat.full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,13 @@ metricbeat.modules:
# Password of hosts. Empty by default
#password: test123

#------------------------------ couchbase Module -----------------------------
#- module: couchbase
#metricsets: ["cluster", "node", "bucket"]
#enabled: true
#period: 10s
#hosts: ["localhost:8091"]

#------------------------------- Docker Module -------------------------------
#- module: docker
#metricsets: ["cpu", "info", "memory", "network", "diskio", "container"]
Expand Down
9 changes: 7 additions & 2 deletions metricbeat/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ services:
build: ${PWD}/.
links:
- apache
- couchbase
- mongodb
- kafka
- mysql
Expand All @@ -15,6 +16,9 @@ services:
environment:
- APACHE_HOST=apache
- APACHE_PORT=80
- COUCHBASE_HOST=couchbase
- COUCHBASE_PORT=8091
- COUCHBASE_DSN=http://Administrator:password@couchbase:8091
- KAFKA_HOST=kafka
- KAFKA_PORT=9092
- NGINX_HOST=nginx
Expand Down Expand Up @@ -50,6 +54,9 @@ services:
apache:
build: ${PWD}/module/apache/_meta

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

kafka:
image: spotify/kafka
expose:
Expand Down Expand Up @@ -80,5 +87,3 @@ services:

zookeeper:
image: jplock/zookeeper:3.4.8


1 change: 1 addition & 0 deletions metricbeat/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ waitFor() {

# Main
waitFor ${APACHE_HOST} ${APACHE_PORT} Apache
waitFor ${COUCHBASE_HOST} ${COUCHBASE_PORT} Couchbase
waitFor ${HAPROXY_HOST} ${HAPROXY_PORT} HAProxy
waitFor ${KAFKA_HOST} ${KAFKA_PORT} Kafka
waitFor ${MYSQL_HOST} ${MYSQL_PORT} MySQL
Expand Down
Loading