From 72fceeba835b91f8df336b5a8fe3469d56fcc373 Mon Sep 17 00:00:00 2001 From: Tim Kuhlman Date: Tue, 4 Mar 2014 10:40:30 -0700 Subject: [PATCH 01/14] Initial test config for mon-agent --- Berksfile | 1 + roles/Basenode.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Berksfile b/Berksfile index c2916e7..2b50970 100644 --- a/Berksfile +++ b/Berksfile @@ -1,6 +1,7 @@ metadata cookbook 'hostsfile', '= 1.0.1' cookbook 'kafka', git: 'git@git.hpcloud.net:mon/cookbooks-kafka' +cookbook 'mon_agent', git: 'git@git.hpcloud.net:mon/cookbooks-mon_agent' cookbook 'mon_persister', git: 'git@git.hpcloud.net:mon/cookbooks-mon_persister' cookbook 'percona', git: 'https://github.com/tkuhlman/chef-percona' cookbook 'vertica', git: 'git@git.hpcloud.net:mon/cookbooks-vertica' diff --git a/roles/Basenode.json b/roles/Basenode.json index 0bd31be..69c91f0 100644 --- a/roles/Basenode.json +++ b/roles/Basenode.json @@ -8,7 +8,8 @@ }, "chef_type": "role", "run_list": [ - "recipe[mini-mon]" + "recipe[mini-mon]", + "recipe[mon_agent]" ], "env_run_lists": { } From 8fe37803417fb9c16703918a5be1f391eaa73b4a Mon Sep 17 00:00:00 2001 From: Tim Kuhlman Date: Tue, 4 Mar 2014 10:40:30 -0700 Subject: [PATCH 02/14] Initial test config for mon-agent --- Berksfile | 1 + roles/Basenode.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Berksfile b/Berksfile index 84c0413..8f2beb9 100644 --- a/Berksfile +++ b/Berksfile @@ -2,6 +2,7 @@ metadata cookbook 'hostsfile', '= 1.0.1' cookbook 'mon_api', git: 'git@git.hpcloud.net:mon/cookbooks-mon_api' cookbook 'kafka', git: 'git@git.hpcloud.net:mon/cookbooks-kafka' +cookbook 'mon_agent', git: 'git@git.hpcloud.net:mon/cookbooks-mon_agent' cookbook 'mon_notification', git: 'git@git.hpcloud.net:mon/cookbooks-mon_notification' cookbook 'mon_persister', git: 'git@git.hpcloud.net:mon/cookbooks-mon_persister' cookbook 'percona', git: 'https://github.com/tkuhlman/chef-percona' diff --git a/roles/Basenode.json b/roles/Basenode.json index 0bd31be..69c91f0 100644 --- a/roles/Basenode.json +++ b/roles/Basenode.json @@ -8,7 +8,8 @@ }, "chef_type": "role", "run_list": [ - "recipe[mini-mon]" + "recipe[mini-mon]", + "recipe[mon_agent]" ], "env_run_lists": { } From 107943e814bebbb232b7787e287bc1a186ae564b Mon Sep 17 00:00:00 2001 From: gary-hessler Date: Fri, 14 Mar 2014 11:56:33 -0600 Subject: [PATCH 03/14] Added databag for mon-agent --- .gitignore | 1 + data_bags/mon_agent/mon_agent.json | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 data_bags/mon_agent/mon_agent.json diff --git a/.gitignore b/.gitignore index 43c013a..163ca9c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .vagrant Berksfile.lock +.project diff --git a/data_bags/mon_agent/mon_agent.json b/data_bags/mon_agent/mon_agent.json new file mode 100644 index 0000000..2e738d1 --- /dev/null +++ b/data_bags/mon_agent/mon_agent.json @@ -0,0 +1,15 @@ +{ + "id" : "mon_agent", + "api" : { + "hostname" : "192.168.10.4", + "mon_api_url" : "http://192.168.10.4:8080/v2.0/metrics", + "mon_api_project_id" : "82510970543135", + "use_keystone" : "false", + "aggregate_metrics" : "true", + "tags" : [ + "Mini-mon", + "Dev" + ], + "log_level" : "DEBUG" + }, +} From 25c9370f63cfb494c5eeb06fd9e77346bf6231db Mon Sep 17 00:00:00 2001 From: gary-hessler Date: Fri, 14 Mar 2014 13:56:18 -0600 Subject: [PATCH 04/14] Adding new databag --- Berksfile | 2 +- data_bags/mon_agent/mon_agent.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Berksfile b/Berksfile index 8f2beb9..72897a2 100644 --- a/Berksfile +++ b/Berksfile @@ -2,7 +2,7 @@ metadata cookbook 'hostsfile', '= 1.0.1' cookbook 'mon_api', git: 'git@git.hpcloud.net:mon/cookbooks-mon_api' cookbook 'kafka', git: 'git@git.hpcloud.net:mon/cookbooks-kafka' -cookbook 'mon_agent', git: 'git@git.hpcloud.net:mon/cookbooks-mon_agent' +cookbook 'mon_agent', path: '/Users/gary/cloudos/cookbooks-mon_agent' cookbook 'mon_notification', git: 'git@git.hpcloud.net:mon/cookbooks-mon_notification' cookbook 'mon_persister', git: 'git@git.hpcloud.net:mon/cookbooks-mon_persister' cookbook 'percona', git: 'https://github.com/tkuhlman/chef-percona' diff --git a/data_bags/mon_agent/mon_agent.json b/data_bags/mon_agent/mon_agent.json index 2e738d1..9e95534 100644 --- a/data_bags/mon_agent/mon_agent.json +++ b/data_bags/mon_agent/mon_agent.json @@ -11,5 +11,5 @@ "Dev" ], "log_level" : "DEBUG" - }, + } } From 348dd6d526b65269b608676e39d7a781f544b36c Mon Sep 17 00:00:00 2001 From: gary-hessler Date: Fri, 14 Mar 2014 13:58:34 -0600 Subject: [PATCH 05/14] Fixing Berksfile --- Berksfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Berksfile b/Berksfile index 72897a2..8f2beb9 100644 --- a/Berksfile +++ b/Berksfile @@ -2,7 +2,7 @@ metadata cookbook 'hostsfile', '= 1.0.1' cookbook 'mon_api', git: 'git@git.hpcloud.net:mon/cookbooks-mon_api' cookbook 'kafka', git: 'git@git.hpcloud.net:mon/cookbooks-kafka' -cookbook 'mon_agent', path: '/Users/gary/cloudos/cookbooks-mon_agent' +cookbook 'mon_agent', git: 'git@git.hpcloud.net:mon/cookbooks-mon_agent' cookbook 'mon_notification', git: 'git@git.hpcloud.net:mon/cookbooks-mon_notification' cookbook 'mon_persister', git: 'git@git.hpcloud.net:mon/cookbooks-mon_persister' cookbook 'percona', git: 'https://github.com/tkuhlman/chef-percona' From efbda287ed8ae218cc2c4fdb2a2dd6e585d51188 Mon Sep 17 00:00:00 2001 From: Tim Kuhlman Date: Tue, 4 Mar 2014 10:40:30 -0700 Subject: [PATCH 06/14] Initial test config for mon-agent --- Berksfile | 1 + roles/Basenode.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Berksfile b/Berksfile index 84c0413..8f2beb9 100644 --- a/Berksfile +++ b/Berksfile @@ -2,6 +2,7 @@ metadata cookbook 'hostsfile', '= 1.0.1' cookbook 'mon_api', git: 'git@git.hpcloud.net:mon/cookbooks-mon_api' cookbook 'kafka', git: 'git@git.hpcloud.net:mon/cookbooks-kafka' +cookbook 'mon_agent', git: 'git@git.hpcloud.net:mon/cookbooks-mon_agent' cookbook 'mon_notification', git: 'git@git.hpcloud.net:mon/cookbooks-mon_notification' cookbook 'mon_persister', git: 'git@git.hpcloud.net:mon/cookbooks-mon_persister' cookbook 'percona', git: 'https://github.com/tkuhlman/chef-percona' diff --git a/roles/Basenode.json b/roles/Basenode.json index 5bec969..2866d31 100644 --- a/roles/Basenode.json +++ b/roles/Basenode.json @@ -12,7 +12,8 @@ "chef_type": "role", "run_list": [ "recipe[apt]", - "recipe[mini-mon]" + "recipe[mini-mon]", + "recipe[mon_agent]" ], "env_run_lists": { } From e2f1166a3212000cf36062b9673a0012d35ebfdd Mon Sep 17 00:00:00 2001 From: gary-hessler Date: Fri, 14 Mar 2014 11:56:33 -0600 Subject: [PATCH 07/14] Added databag for mon-agent --- .gitignore | 1 + data_bags/mon_agent/mon_agent.json | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 data_bags/mon_agent/mon_agent.json diff --git a/.gitignore b/.gitignore index 43c013a..163ca9c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .vagrant Berksfile.lock +.project diff --git a/data_bags/mon_agent/mon_agent.json b/data_bags/mon_agent/mon_agent.json new file mode 100644 index 0000000..2e738d1 --- /dev/null +++ b/data_bags/mon_agent/mon_agent.json @@ -0,0 +1,15 @@ +{ + "id" : "mon_agent", + "api" : { + "hostname" : "192.168.10.4", + "mon_api_url" : "http://192.168.10.4:8080/v2.0/metrics", + "mon_api_project_id" : "82510970543135", + "use_keystone" : "false", + "aggregate_metrics" : "true", + "tags" : [ + "Mini-mon", + "Dev" + ], + "log_level" : "DEBUG" + }, +} From e7e07a5eb69012b5f3d8568dd67a9fa11fde190c Mon Sep 17 00:00:00 2001 From: gary-hessler Date: Fri, 14 Mar 2014 13:56:18 -0600 Subject: [PATCH 08/14] Adding new databag --- Berksfile | 2 +- data_bags/mon_agent/mon_agent.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Berksfile b/Berksfile index 8f2beb9..72897a2 100644 --- a/Berksfile +++ b/Berksfile @@ -2,7 +2,7 @@ metadata cookbook 'hostsfile', '= 1.0.1' cookbook 'mon_api', git: 'git@git.hpcloud.net:mon/cookbooks-mon_api' cookbook 'kafka', git: 'git@git.hpcloud.net:mon/cookbooks-kafka' -cookbook 'mon_agent', git: 'git@git.hpcloud.net:mon/cookbooks-mon_agent' +cookbook 'mon_agent', path: '/Users/gary/cloudos/cookbooks-mon_agent' cookbook 'mon_notification', git: 'git@git.hpcloud.net:mon/cookbooks-mon_notification' cookbook 'mon_persister', git: 'git@git.hpcloud.net:mon/cookbooks-mon_persister' cookbook 'percona', git: 'https://github.com/tkuhlman/chef-percona' diff --git a/data_bags/mon_agent/mon_agent.json b/data_bags/mon_agent/mon_agent.json index 2e738d1..9e95534 100644 --- a/data_bags/mon_agent/mon_agent.json +++ b/data_bags/mon_agent/mon_agent.json @@ -11,5 +11,5 @@ "Dev" ], "log_level" : "DEBUG" - }, + } } From edc79f3656c05d7cb65ed5c892d8acf38eed1fa0 Mon Sep 17 00:00:00 2001 From: gary-hessler Date: Fri, 14 Mar 2014 13:58:34 -0600 Subject: [PATCH 09/14] Fixing Berksfile --- Berksfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Berksfile b/Berksfile index 72897a2..8f2beb9 100644 --- a/Berksfile +++ b/Berksfile @@ -2,7 +2,7 @@ metadata cookbook 'hostsfile', '= 1.0.1' cookbook 'mon_api', git: 'git@git.hpcloud.net:mon/cookbooks-mon_api' cookbook 'kafka', git: 'git@git.hpcloud.net:mon/cookbooks-kafka' -cookbook 'mon_agent', path: '/Users/gary/cloudos/cookbooks-mon_agent' +cookbook 'mon_agent', git: 'git@git.hpcloud.net:mon/cookbooks-mon_agent' cookbook 'mon_notification', git: 'git@git.hpcloud.net:mon/cookbooks-mon_notification' cookbook 'mon_persister', git: 'git@git.hpcloud.net:mon/cookbooks-mon_persister' cookbook 'percona', git: 'https://github.com/tkuhlman/chef-percona' From 608d4eafe3effc29a70861b59bc53476e7c90add Mon Sep 17 00:00:00 2001 From: Tim Kuhlman Date: Fri, 14 Mar 2014 14:31:24 -0600 Subject: [PATCH 10/14] Fixed ordering of apt recipe --- roles/Basenode.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/Basenode.json b/roles/Basenode.json index 2866d31..aa88265 100644 --- a/roles/Basenode.json +++ b/roles/Basenode.json @@ -11,8 +11,8 @@ }, "chef_type": "role", "run_list": [ - "recipe[apt]", "recipe[mini-mon]", + "recipe[apt]", "recipe[mon_agent]" ], "env_run_lists": { From a5a4289dc1b0ef1e84e6a5ae27f4bcbd323b9634 Mon Sep 17 00:00:00 2001 From: gary-hessler Date: Sun, 16 Mar 2014 21:04:43 -0600 Subject: [PATCH 11/14] Update databag --- Berksfile | 2 +- data_bags/mon_agent/mon_agent.json | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Berksfile b/Berksfile index 8f2beb9..72897a2 100644 --- a/Berksfile +++ b/Berksfile @@ -2,7 +2,7 @@ metadata cookbook 'hostsfile', '= 1.0.1' cookbook 'mon_api', git: 'git@git.hpcloud.net:mon/cookbooks-mon_api' cookbook 'kafka', git: 'git@git.hpcloud.net:mon/cookbooks-kafka' -cookbook 'mon_agent', git: 'git@git.hpcloud.net:mon/cookbooks-mon_agent' +cookbook 'mon_agent', path: '/Users/gary/cloudos/cookbooks-mon_agent' cookbook 'mon_notification', git: 'git@git.hpcloud.net:mon/cookbooks-mon_notification' cookbook 'mon_persister', git: 'git@git.hpcloud.net:mon/cookbooks-mon_persister' cookbook 'percona', git: 'https://github.com/tkuhlman/chef-percona' diff --git a/data_bags/mon_agent/mon_agent.json b/data_bags/mon_agent/mon_agent.json index 9e95534..d7b2d97 100644 --- a/data_bags/mon_agent/mon_agent.json +++ b/data_bags/mon_agent/mon_agent.json @@ -1,15 +1,14 @@ { "id" : "mon_agent", + "tags" : [ + "Mini-mon", + "Dev" + ], + "log_level" : "DEBUG", "api" : { - "hostname" : "192.168.10.4", "mon_api_url" : "http://192.168.10.4:8080/v2.0/metrics", "mon_api_project_id" : "82510970543135", "use_keystone" : "false", - "aggregate_metrics" : "true", - "tags" : [ - "Mini-mon", - "Dev" - ], - "log_level" : "DEBUG" + "aggregate_metrics" : "true" } } From 4f5b325763ea0a4803a467860e973f0cddb16f50 Mon Sep 17 00:00:00 2001 From: gary-hessler Date: Sun, 16 Mar 2014 21:04:43 -0600 Subject: [PATCH 12/14] Update databag --- data_bags/mon_agent/mon_agent.json | 58 +++++++++++++++++++++++++++--- 1 file changed, 54 insertions(+), 4 deletions(-) diff --git a/data_bags/mon_agent/mon_agent.json b/data_bags/mon_agent/mon_agent.json index d7b2d97..7538c05 100644 --- a/data_bags/mon_agent/mon_agent.json +++ b/data_bags/mon_agent/mon_agent.json @@ -1,14 +1,64 @@ { "id" : "mon_agent", - "tags" : [ - "Mini-mon", - "Dev" - ], + "tags" : "Origin:Mini-mon, Environment:Dev", "log_level" : "DEBUG", + "send_to_datadog": "false", + "dd_url": "https://app.datadoghq.com", + "api_key": "", + "send_to_mon_api": "true", "api" : { "mon_api_url" : "http://192.168.10.4:8080/v2.0/metrics", "mon_api_project_id" : "82510970543135", "use_keystone" : "false", "aggregate_metrics" : "true" + }, + "metric_name_map" : { + "agentVersion_mapping": "DISCARD", + "apiKey_mapping": "DISCARD", + "collection_timestamp_mapping": "DISCARD", + "cpuIdle_mapping" : "cpu_idle_perc", + "cpuStolen_mapping" : "cpu_stolen_perc", + "cpuSystem_mapping" : "cpu_system_perc", + "cpuWait_mapping" : "cpu_iowait_perc", + "events_mapping": "DISCARD", + "host-tags_mapping": "DISCARD", + "internalHostname_mapping" : "DISCARD", + "rkB/s_mapping" : "io_read_kbytes_sec", + "avgrq-sz_mapping" : "DISCARD", + "%util_mapping" : "DISCARD", + "svctm_mapping" : "DISCARD", + "r/s_mapping" : "io_read_req_sec", + "wrqm/s_mapping" : "DISCARD", + "wkB/s_mapping" : "io_write_kbytes_sec", + "r_await_mapping" : "DISCARD", + "w_await_mapping" : "DISCARD", + "rrqm/s_mapping" : "DISCARD", + "w/s_mapping" : "io_write_req_sec", + "await_mapping" : "DISCARD", + "avgqu-sz_mapping" : "DISCARD", + "memPhysTotal_mapping" : "mem_total_mb", + "memPhysFree_mapping" : "mem_free_mb", + "memPhysUsable_mapping" : "mem_usable_mb", + "memPhysPctUsable_mapping" : "mem_usable_perc", + "memPhysUsed_mapping" : "mem_usable_perc", + "memBuffers_mapping" : "mem_used_buffers", + "memCached_mapping" : "mem_used_cached", + "memShared_mapping" : "mem_used_shared", + "memSwapPctFree_mapping" : "mem_swap_free_perc", + "memSwapTotal_mapping" : "mem_swap_total_mb", + "memSwapUsed_mapping" : "mem_swap_used_mb", + "memSwapFree_mapping" : "mem_swap_free_mb", + "meta_mapping": "DISCARD", + "os_mapping": "DISCARD", + "processes_mapping": "DISCARD", + "python_mapping": "DISCARD", + "system.load.1_mapping" : "load_avg_1_min", + "system.load.5_mapping" : "load_avg_5_min", + "system.load.15_mapping" : "load_avg_15_min", + "system.load.norm.1_mapping": "DISCARD", + "system.load.norm.5_mapping": "DISCARD", + "system.load.norm.15_mapping": "DISCARD", + "systemStats_mapping": "DISCARD", + "uuid_mapping": "DISCARD" } } From 73f467103fff673c3fa657b7c8b31b4ed48ab894 Mon Sep 17 00:00:00 2001 From: gary-hessler Date: Wed, 26 Mar 2014 22:20:38 -0600 Subject: [PATCH 13/14] Fixing Berksfile --- Berksfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Berksfile b/Berksfile index 72897a2..8f2beb9 100644 --- a/Berksfile +++ b/Berksfile @@ -2,7 +2,7 @@ metadata cookbook 'hostsfile', '= 1.0.1' cookbook 'mon_api', git: 'git@git.hpcloud.net:mon/cookbooks-mon_api' cookbook 'kafka', git: 'git@git.hpcloud.net:mon/cookbooks-kafka' -cookbook 'mon_agent', path: '/Users/gary/cloudos/cookbooks-mon_agent' +cookbook 'mon_agent', git: 'git@git.hpcloud.net:mon/cookbooks-mon_agent' cookbook 'mon_notification', git: 'git@git.hpcloud.net:mon/cookbooks-mon_notification' cookbook 'mon_persister', git: 'git@git.hpcloud.net:mon/cookbooks-mon_persister' cookbook 'percona', git: 'https://github.com/tkuhlman/chef-percona' From c8f8ec4fad9f53c6c86c0eac2befbc85e34104a6 Mon Sep 17 00:00:00 2001 From: gary-hessler Date: Thu, 27 Mar 2014 07:59:54 -0600 Subject: [PATCH 14/14] Fixing Basenode --- roles/Basenode.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/roles/Basenode.json b/roles/Basenode.json index f97d979..aa88265 100644 --- a/roles/Basenode.json +++ b/roles/Basenode.json @@ -12,12 +12,8 @@ "chef_type": "role", "run_list": [ "recipe[mini-mon]", -<<<<<<< HEAD - "recipe[apt]" -======= "recipe[apt]", "recipe[mon_agent]" ->>>>>>> feature/agent ], "env_run_lists": { }