Merge "Remove the hostname from AFD when related to cluster"
diff --git a/heka/_common.sls b/heka/_common.sls
index 1753840..9f71c31 100644
--- a/heka/_common.sls
+++ b/heka/_common.sls
@@ -7,15 +7,24 @@
/usr/share/lma_collector:
file.recurse:
- source: salt://heka/files/lua
+ - user: root
+ - group: heka
+ - file_mode: 640
+ - dir_mode: 750
+ - require:
+ - user: heka_user
/usr/share/lma_collector/common/extra_fields.lua:
file.managed:
- source: salt://heka/files/extra_fields.lua
- user: root
- - mode: 644
+ - group: heka
+ - mode: 640
- defaults:
extra_fields: {{ server.extra_fields }}
- template: jinja
+ - require:
+ - user: heka_user
heka_user:
user.present:
diff --git a/heka/_service.sls b/heka/_service.sls
index 22e9fe1..76754ab 100644
--- a/heka/_service.sls
+++ b/heka/_service.sls
@@ -13,6 +13,7 @@
file.directory:
- name: /var/cache/{{ service_name }}
- user: heka
+ - group: heka
- mode: 750
- makedirs: true
diff --git a/heka/files/lua/decoders/collectd.lua b/heka/files/lua/decoders/collectd.lua
index 7978bd2..3988c17 100644
--- a/heka/files/lua/decoders/collectd.lua
+++ b/heka/files/lua/decoders/collectd.lua
@@ -137,6 +137,8 @@
elseif metric_source == 'disk' then
if sample['type'] == 'disk_io_time' then
msg['Fields']['name'] = 'disk' .. sep .. sample['dsnames'][i]
+ elseif sample['type'] == 'pending_operations' then
+ msg['Fields']['name'] = 'disk' .. sep .. sample['type']
else
msg['Fields']['name'] = metric_name
end
@@ -457,7 +459,7 @@
msg['Fields']['name'] = 'logged_users'
msg['Fields']['hostname'] = sample['host']
table.insert(msg['Fields']['tag_fields'], 'hostname')
- elseif metric_source == 'libvirt' then
+ elseif metric_source == 'libvirt' or metric_source == 'virt' then
-- collectd sends the instance's ID in the 'host' field
msg['Fields']['instance_id'] = sample['host']
table.insert(msg['Fields']['tag_fields'], 'instance_id')
diff --git a/metadata/service/aggregator/output/nagios.yml b/metadata/service/aggregator/output/nagios.yml
index 7c30db1..ae167c1 100644
--- a/metadata/service/aggregator/output/nagios.yml
+++ b/metadata/service/aggregator/output/nagios.yml
@@ -1,5 +1,12 @@
parameters:
+ _param:
+ nagios_username: nagiosadmin
+ nagios_default_host_alarm_clusters: 00-clusters
+ nagios_host_dimension_key: nagios_host
heka:
aggregator:
- nagios_host_dimension_key: nagios_host
- nagios_host: ${_param:nagios_host}
\ No newline at end of file
+ nagios_host: ${_param:nagios_host}
+ nagios_username: ${_param:nagios_username}
+ nagios_password: ${_param:nagios_password}
+ nagios_host_dimension_key: ${_param:nagios_host_dimension_key}
+ nagios_default_host_alarm_clusters: ${_param:nagios_default_host_alarm_clusters}
diff --git a/metadata/service/aggregator/output/sensu.yml b/metadata/service/aggregator/output/sensu.yml
index 394acb6..37b2cf8 100644
--- a/metadata/service/aggregator/output/sensu.yml
+++ b/metadata/service/aggregator/output/sensu.yml
@@ -1,5 +1,7 @@
parameters:
+ _param:
+ sensu_source_dimension_key: nagios_host
heka:
aggregator:
- sensu_source_dimension_key: nagios_host
+ sensu_source_dimension_key: ${_param:sensu_source_dimension_key}
sensu_host: 127.0.0.1
diff --git a/metadata/service/metric_collector/output/nagios.yml b/metadata/service/metric_collector/output/nagios.yml
new file mode 100644
index 0000000..08a45dd
--- /dev/null
+++ b/metadata/service/metric_collector/output/nagios.yml
@@ -0,0 +1,12 @@
+parameters:
+ _param:
+ nagios_username: nagiosadmin
+ nagios_default_host_alarm_clusters: 00-clusters
+ nagios_host_dimension_key: nagios_host
+ heka:
+ metric_collector:
+ nagios_host: ${_param:nagios_host}
+ nagios_username: ${_param:nagios_username}
+ nagios_password: ${_param:nagios_password}
+ nagios_host_dimension_key: ${_param:nagios_host_dimension_key}
+ nagios_default_host_alarm_clusters: ${_param:nagios_default_host_alarm_clusters}
diff --git a/metadata/service/metric_collector/single.yml b/metadata/service/metric_collector/single.yml
index 2e4a442..ad183a2 100644
--- a/metadata/service/metric_collector/single.yml
+++ b/metadata/service/metric_collector/single.yml
@@ -5,10 +5,8 @@
parameters:
_param:
metric_collector_poolsize: 100
- nagios_host_dimension_key: nagios_host
heka:
metric_collector:
enabled: true
influxdb_time_precision: ms
poolsize: ${_param:metric_collector_poolsize}
- nagios_host_dimension_key: ${_param:nagios_host_dimension_key}