projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Increases delta of start_time when collecting OpenStack metrics
[osm/MON.git]
/
osm_mon
/
core
/
settings.py
diff --git
a/osm_mon/core/settings.py
b/osm_mon/core/settings.py
index
8f5e8f5
..
a5d352b
100644
(file)
--- a/
osm_mon/core/settings.py
+++ b/
osm_mon/core/settings.py
@@
-26,7
+26,7
@@
import os
from collections import namedtuple
from collections import namedtuple
-from osm_mon.
plugins.OpenStack
.singleton import Singleton
+from osm_mon.
core
.singleton import Singleton
import six
import six
@@
-60,16
+60,19
@@
class Config(object):
_configuration = [
CfgParam('BROKER_URI', "localhost:9092", six.text_type),
_configuration = [
CfgParam('BROKER_URI', "localhost:9092", six.text_type),
- CfgParam('MONGO_URI', "mongo:27017", six.text_type),
+ CfgParam('MONGO_URI', "mongo
db://mongo
:27017", six.text_type),
CfgParam('DATABASE', "sqlite:///mon_sqlite.db", 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('REQUEST_TIMEOUT', 10, int),
+ CfgParam('OS_DEFAULT_GRANULARITY', 300, int),
+ CfgParam('OSMMON_REQUEST_TIMEOUT', 10, int),
CfgParam('OSMMON_LOG_LEVEL', "INFO", six.text_type),
CfgParam('OSMMON_KAFKA_LOG_LEVEL', "WARN", six.text_type),
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_COLLECTOR_INTERVAL', 30, int),
+ CfgParam('OSMMON_EVALUATOR_INTERVAL', 30, int),
CfgParam('OSMMON_VCA_HOST', "localhost", six.text_type),
CfgParam('OSMMON_VCA_SECRET', "secret", six.text_type),
CfgParam('OSMMON_VCA_HOST', "localhost", six.text_type),
CfgParam('OSMMON_VCA_SECRET', "secret", six.text_type),
+ CfgParam('OSMMON_VCA_USER', "admin", six.text_type),
+ CfgParam('OSMMON_DATABASE_COMMONKEY', "changeme", six.text_type),
+ CfgParam('OSMMON_PROMETHEUS_URL', "http://prometheus:9090", six.text_type),
]
_config_dict = {cfg.key: cfg for cfg in _configuration}
]
_config_dict = {cfg.key: cfg for cfg in _configuration}