Changes way metrics are collected, removing the use of mon-proxy

[osm/MON.git] / osm_mon / core / settings.py

diff --git a/osm_mon/core/settings.py b/osm_mon/core/settings.py
index e40fecd..a7599cc 100644 (file)
--- a/osm_mon/core/settings.py
+++ b/osm_mon/core/settings.py
@@ -60,8 +60,17 @@ class Config(object):
 
     _configuration = [
         CfgParam('BROKER_URI', "localhost:9092", six.text_type),
+        CfgParam('MONGO_URI', "mongo:27017", six.text_type),
+        CfgParam('DATABASE', "sqlite:///mon_sqlite.db", six.text_type),
         CfgParam('OS_NOTIFIER_URI', "http://localhost:8662", six.text_type),
-        CfgParam('OS_DEFAULT_GRANULARITY', "300", six.text_type),
+        CfgParam('OS_DEFAULT_GRANULARITY', 300, int),
+        CfgParam('REQUEST_TIMEOUT', 10, int),
+        CfgParam('OSMMON_LOG_LEVEL', "INFO", six.text_type),
+        CfgParam('OSMMON_KAFKA_LOG_LEVEL', "WARN", six.text_type),
+        CfgParam('OSMMON_COLLECTOR_INTERVAL', 10, int),
+        CfgParam('OSMMON_VCA_HOST', "localhost", six.text_type),
+        CfgParam('OSMMON_VCA_SECRET', "secret", six.text_type),
+        CfgParam('OSMMON_VCA_USER', "admin", six.text_type),
     ]
 
     _config_dict = {cfg.key: cfg for cfg in _configuration}
@@ -71,13 +80,14 @@ class Config(object):
         """Set the default values."""
         for cfg in self._configuration:
             setattr(self, cfg.key, cfg.default)
+        self.read_environ()
 
     def read_environ(self):
         """Check the appropriate environment variables and update defaults."""
         for key in self._config_keys:
             try:
-                val = str(os.environ[key])
+                val = self._config_dict[key].data_type(os.environ[key])
                 setattr(self, key, val)
             except KeyError as exc:
-                log.warn("Failed to configure plugin: %s", exc)
+                log.debug("Environment variable not present: %s", exc)
         return