Merge pull request #14 from elemoine/stacklight-hostname
Set "hostname" in the linux_hdd_errors|counters filters
diff --git a/linux/meta/heka.yml b/linux/meta/heka.yml
index 62d3fb7..9332791 100644
--- a/linux/meta/heka.yml
+++ b/linux/meta/heka.yml
@@ -1,9 +1,9 @@
log_collector:
decoder:
- linux_syslog:
+ system:
engine: sandbox
module_file: /usr/share/lma_collector/decoders/generic_syslog.lua
- module_dir: /usr/share/lma_collector_modules;/usr/share/heka/lua_modules
+ module_dir: /usr/share/lma_collector/common;/usr/share/heka/lua_modules
config:
syslog_pattern: '<%PRI%>%TIMESTAMP% %HOSTNAME% %syslogtag%%msg:::sp-if-no-1st-sp%%msg%\n'
fallback_syslog_pattern: '%TIMESTAMP% %HOSTNAME% %syslogtag%%msg:::sp-if-no-1st-sp%%msg%\n'
@@ -19,7 +19,7 @@
linux_hdd_errors:
engine: sandbox
module_file: /usr/share/lma_collector/filters/hdd_errors_counter.lua
- module_dir: /usr/share/lma_collector_modules;/usr/share/heka/lua_modules
+ module_dir: /usr/share/lma_collector/common;/usr/share/heka/lua_modules
preserve_data: false
message_matcher: "Type == 'log' && Logger == 'system.kern'"
ticker_interval: 10
@@ -30,7 +30,7 @@
linux_logs_counter:
engine: sandbox
module_file: /usr/share/lma_collector/filters/logs_counter.lua
- module_dir: /usr/share/lma_collector_modules;/usr/share/heka/lua_modules
+ module_dir: /usr/share/lma_collector/common;/usr/share/heka/lua_modules
preserve_data: true
message_matcher: "Type == 'log' && Logger =~ /^openstack\\\\./"
ticker_interval: 1
@@ -39,32 +39,4 @@
grace_interval: 30
hostname: '{{ grains.host }}'
metric_collector:
- filter:
- linux_cpu_utilization:
- engine: sandbox
- module_file: /usr/share/lma_collector/filters/afd.lua
- module_dir: /usr/share/lma_collector_modules;/usr/share/heka/lua_modules
- preserve_data: false
- message_matcher: "(Type == 'metric' || Type == 'heka.sandbox.metric') && (Fields[name] == 'cpu_idle' || Fields[name] == 'cpu_wait')"
- ticker_interval: 10
- config:
- afd_type: 'node'
- afd_file: 'lma_alarms_controller_cpu'
- afd_cluster_name: 'controller'
- afd_logical_name: 'cpu'
- activate_alerting: true
- enable_notification: false
- linux_swap_utilization:
- engine: sandbox
- module_file: /usr/share/lma_collector/filters/afd.lua
- module_dir: /usr/share/lma_collector_modules;/usr/share/heka/lua_modules
- preserve_data: false
- message_matcher: "(Type == 'metric' || Type == 'heka.sandbox.metric') && (Fields[name] == 'swap_free' || Fields[name] == 'swap_io_in' || Fields[name] == 'swap_io_out' || Fields[name] == 'swap_percent_used')"
- ticker_interval: 10
- config:
- afd_type: 'node'
- afd_file: 'lma_alarms_controller_swap'
- afd_cluster_name: 'controller'
- afd_logical_name: 'swap'
- activate_alerting: true
- enable_notification: false
+ filter: {}