Some cleanings after more integration tests - statsd for the Alignak …

…daemons
Alignak-monitoring · Feb 16, 2018 · c564f54 · c564f54
1 parent e24a095
commit c564f54
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 37 deletions.
diff --git a/alignak/daemon.py b/alignak/daemon.py
@@ -639,6 +639,11 @@ def __init__(self, name, **kwargs):
 
         self.set_dir_filename(self.pid_filename)
 
+        # Configure our Stats manager
+        statsmgr.register(self.name, self.type,
+                          statsd_host=self.statsd_host, statsd_port=self.statsd_port,
+                          statsd_prefix=self.statsd_prefix, statsd_enabled=self.statsd_enabled)
+
         # Track time
         now = time.time()
         self.program_start = now

diff --git a/alignak/satellite.py b/alignak/satellite.py
@@ -270,13 +270,13 @@ def setup_new_conf(self):
                 os.environ['TZ'] = use_timezone
                 time.tzset()
 
-            # Configure our Stats manager
-            statsmgr.register(self.name, self.type,
-                              statsd_host=self_conf.get('statsd_host', 'localhost'),
-                              statsd_port=self_conf.get('statsd_port', 8125),
-                              statsd_prefix=self_conf.get('statsd_prefix', 'alignak'),
-                              statsd_enabled=self_conf.get('statsd_enabled', False))
-
+            # # Configure our Stats manager
+            # statsmgr.register(self.name, self.type,
+            #                   statsd_host=self_conf.get('statsd_host', 'localhost'),
+            #                   statsd_port=self_conf.get('statsd_port', 8125),
+            #                   statsd_prefix=self_conf.get('statsd_prefix', 'alignak'),
+            #                   statsd_enabled=self_conf.get('statsd_enabled', False))
+            #
             # Now we create our arbiters and schedulers links
             for link_type in ['arbiters', 'schedulers']:
                 if link_type not in self.cur_conf:

diff --git a/test/test_statsd.py b/test/test_statsd.py
@@ -143,18 +143,18 @@ def test_statsmgr_register_enabled(self):
         assert self.statsmgr.statsd_sock is not None
         assert self.statsmgr.statsd_addr is not None
         self.assert_log_match(re.escape(
-            'DEBUG: [arbiter-master.alignak.stats] StatsD configuration for arbiter-master - localhost:8125, '
+            'DEBUG: [alignak_tests.alignak.stats] StatsD configuration for arbiter-master - localhost:8125, '
             'prefix: alignak, enabled: True, broks: False, file: None'
         ), 0)
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] Sending arbiter-master daemon statistics '
+            'INFO: [alignak_tests.alignak.stats] Sending arbiter-master daemon statistics '
             'to: localhost:8125, prefix: alignak'
         ), 1)
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] Trying to contact StatsD server...'
+            'INFO: [alignak_tests.alignak.stats] Trying to contact StatsD server...'
         ), 2)
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] StatsD server contacted'
+            'INFO: [alignak_tests.alignak.stats] StatsD server contacted'
         ), 3)
 
     def test_statsmgr_register_enabled_broks(self):
@@ -173,18 +173,18 @@ def test_statsmgr_register_enabled_broks(self):
         assert self.statsmgr.statsd_sock is not None
         assert self.statsmgr.statsd_addr is not None
         self.assert_log_match(re.escape(
-            'DEBUG: [arbiter-master.alignak.stats] StatsD configuration for arbiter-master - localhost:8125, '
+            'DEBUG: [alignak_tests.alignak.stats] StatsD configuration for arbiter-master - localhost:8125, '
             'prefix: alignak, enabled: True, broks: True, file: None'
         ), 0)
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] Sending arbiter-master daemon statistics '
+            'INFO: [alignak_tests.alignak.stats] Sending arbiter-master daemon statistics '
             'to: localhost:8125, prefix: alignak'
         ), 1)
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] Trying to contact StatsD server...'
+            'INFO: [alignak_tests.alignak.stats] Trying to contact StatsD server...'
         ), 2)
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] StatsD server contacted'
+            'INFO: [alignak_tests.alignak.stats] StatsD server contacted'
         ), 3)
 
     def test_statsmgr_connect(self):
@@ -214,15 +214,18 @@ def test_statsmgr_connect_port_error(self):
                                           statsd_host='localhost', statsd_port=8888,
                                           statsd_prefix='alignak', statsd_enabled=True)
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] Sending arbiter-master daemon statistics '
+            'INFO: [alignak_tests.alignak.stats] Sending arbiter-master daemon statistics '
             'to: localhost:8888, prefix: alignak'
         ), 1)
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] Trying to contact StatsD server...'
+            'INFO: [alignak_tests.alignak.stats] Trying to contact StatsD server...'
         ), 2)
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] StatsD server contacted'
+            'INFO: [alignak_tests.alignak.stats] StatsD server contacted'
         ), 3)
+        self.assert_log_match(re.escape(
+            '[alignak_tests.alignak.stats] Alignak internal statistics are sent to StatsD.'
+        ), 4)
 
         # "Connected" to StatsD server - even with a bad port number!
         self.assert_no_log_match('Cannot create StatsD socket')
@@ -238,16 +241,16 @@ def test_statsmgr_timer(self):
                                broks_enabled=True)
         self.show_logs()
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] Sending arbiter-master daemon statistics to: localhost:8125, prefix: alignak'
+            'INFO: [alignak_tests.alignak.stats] Sending arbiter-master daemon statistics to: localhost:8125, prefix: alignak'
         ), 1)
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] Trying to contact StatsD server...'
+            'INFO: [alignak_tests.alignak.stats] Trying to contact StatsD server...'
         ), 2)
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] StatsD server contacted'
+            'INFO: [alignak_tests.alignak.stats] StatsD server contacted'
         ), 3)
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] Alignak internal statistics are sent to StatsD.'
+            'INFO: [alignak_tests.alignak.stats] Alignak internal statistics are sent to StatsD.'
         ), 4)
 
         assert self.statsmgr.stats == {}
@@ -326,16 +329,16 @@ def test_statsmgr_counter(self):
                                broks_enabled=True)
         self.show_logs()
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] Sending broker-master daemon statistics to: localhost:8125, prefix: alignak'
+            'INFO: [alignak_tests.alignak.stats] Sending broker-master daemon statistics to: localhost:8125, prefix: alignak'
         ), 1)
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] Trying to contact StatsD server...'
+            'INFO: [alignak_tests.alignak.stats] Trying to contact StatsD server...'
         ), 2)
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] StatsD server contacted'
+            'INFO: [alignak_tests.alignak.stats] StatsD server contacted'
         ), 3)
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] Alignak internal statistics are sent to StatsD.'
+            'INFO: [alignak_tests.alignak.stats] Alignak internal statistics are sent to StatsD.'
         ), 4)
 
         assert self.statsmgr.stats == {}
@@ -414,16 +417,16 @@ def test_statsmgr_gauge(self):
                                broks_enabled=True)
         self.show_logs()
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] Sending arbiter-master daemon statistics to: localhost:8125, prefix: alignak'
+            'INFO: [alignak_tests.alignak.stats] Sending arbiter-master daemon statistics to: localhost:8125, prefix: alignak'
         ), 1)
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] Trying to contact StatsD server...'
+            'INFO: [alignak_tests.alignak.stats] Trying to contact StatsD server...'
         ), 2)
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] StatsD server contacted'
+            'INFO: [alignak_tests.alignak.stats] StatsD server contacted'
         ), 3)
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] Alignak internal statistics are sent to StatsD.'
+            'INFO: [alignak_tests.alignak.stats] Alignak internal statistics are sent to StatsD.'
         ), 4)
 
         assert self.statsmgr.stats == {}
@@ -541,7 +544,7 @@ def test_statsmgr_timer_file(self):
                                statsd_enabled=True, statsd_host=None)
         self.show_logs()
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] Alignak internal statistics are written in the file /tmp/stats.alignak'
+            'INFO: [alignak_tests.alignak.stats] Alignak internal statistics are written in the file /tmp/stats.alignak'
         ), 1)
 
         assert self.statsmgr.stats == {}
@@ -572,7 +575,7 @@ def test_statsmgr_counter_file(self):
                                statsd_enabled=True, statsd_host=None)
         self.show_logs()
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] Alignak internal statistics are written in the file /tmp/stats.alignak'
+            'INFO: [alignak_tests.alignak.stats] Alignak internal statistics are written in the file /tmp/stats.alignak'
         ), 1)
 
         assert self.statsmgr.stats == {}
@@ -595,19 +598,19 @@ def test_statsmgr_gauge_file(self):
                                broks_enabled=True)
         self.show_logs()
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] Sending arbiter-master daemon statistics to: localhost:8125, prefix: alignak'
+            'INFO: [alignak_tests.alignak.stats] Sending arbiter-master daemon statistics to: localhost:8125, prefix: alignak'
         ), 1)
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] Trying to contact StatsD server...'
+            'INFO: [alignak_tests.alignak.stats] Trying to contact StatsD server...'
         ), 2)
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] StatsD server contacted'
+            'INFO: [alignak_tests.alignak.stats] StatsD server contacted'
         ), 3)
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] Alignak internal statistics are sent to StatsD.'
+            'INFO: [alignak_tests.alignak.stats] Alignak internal statistics are sent to StatsD.'
         ), 4)
         self.assert_log_match(re.escape(
-            'INFO: [arbiter-master.alignak.stats] Alignak internal statistics are written in the file /tmp/stats.alignak'
+            'INFO: [alignak_tests.alignak.stats] Alignak internal statistics are written in the file /tmp/stats.alignak'
         ), 5)
 
         assert self.statsmgr.stats == {}