Commit f38eda19 authored by Łukasz Nowak's avatar Łukasz Nowak

software/monitor: React on total time change in surykatka

Since surykatka 0.8.0 the DB is not updated by default on elapsed time change,
and that shall be user explicit configuration. Thus fix
"software/monitor: Version up surykatka 0.8.0" by adding, required from
edgetest-basic perspective, switch ELAPSED_FAST.
parent e78e8f64
Pipeline #28255 passed with stage
in 0 seconds
...@@ -22,7 +22,7 @@ md5sum = 2eb5596544d9c341acf653d4f7ce2680 ...@@ -22,7 +22,7 @@ md5sum = 2eb5596544d9c341acf653d4f7ce2680
[template-monitor-edgetest-basic] [template-monitor-edgetest-basic]
_update_hash_filename_ = instance-monitor-edgetest-basic.cfg.jinja2 _update_hash_filename_ = instance-monitor-edgetest-basic.cfg.jinja2
md5sum = fa044accc1230ece41edfc822eb39f07 md5sum = d375f656087bfbd8a11188721e31de68
[template-node-monitoring] [template-node-monitoring]
_update_hash_filename_ = instance-node-monitoring.jinja2.cfg _update_hash_filename_ = instance-node-monitoring.jinja2.cfg
...@@ -38,4 +38,4 @@ md5sum = d3cfa1f6760e3fa64ccd64acf213bdfb ...@@ -38,4 +38,4 @@ md5sum = d3cfa1f6760e3fa64ccd64acf213bdfb
[template-surykatka-ini] [template-surykatka-ini]
_update_hash_filename_ = surykatka.ini.jinja2 _update_hash_filename_ = surykatka.ini.jinja2
md5sum = 7e9b874c20faaa8190d2bf2b74caa727 md5sum = 4dbc223cb7294eecb31d19f3afb82e86
...@@ -92,6 +92,7 @@ nameserver_list = {{ dumps(DEFAULT_DICT['nameserver-list']) }} ...@@ -92,6 +92,7 @@ nameserver_list = {{ dumps(DEFAULT_DICT['nameserver-list']) }}
json = ${directory:srv}/surykatka-{{ class }}.json json = ${directory:srv}/surykatka-{{ class }}.json
{#- timeout is just a bit bigger than class time #} {#- timeout is just a bit bigger than class time #}
timeout = {{ int(class) + 2 }} timeout = {{ int(class) + 2 }}
check_maximum_elapsed_time = {{ int(class) }}
context = context =
import json_module json import json_module json
...@@ -99,6 +100,7 @@ context = ...@@ -99,6 +100,7 @@ context =
key nameserver_list :nameserver_list key nameserver_list :nameserver_list
key url_list :url_list key url_list :url_list
key timeout :timeout key timeout :timeout
key check_maximum_elapsed_time :check_maximum_elapsed_time
{%- do PART_LIST.append('surykatka-%i'% (class,)) %} {%- do PART_LIST.append('surykatka-%i'% (class,)) %}
[surykatka-{{ class }}] [surykatka-{{ class }}]
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
INTERVAL = 120 INTERVAL = 120
TIMEOUT = {{ timeout }} TIMEOUT = {{ timeout }}
SQLITE = {{ db }} SQLITE = {{ db }}
ELAPSED_FAST = {{ check_maximum_elapsed_time }}
{%- if len(nameserver_list) > 0 %} {%- if len(nameserver_list) > 0 %}
NAMESERVER = NAMESERVER =
{%- for nameserver_entry in sorted(nameserver_list) %} {%- for nameserver_entry in sorted(nameserver_list) %}
......
...@@ -344,6 +344,7 @@ class TestEdgeBasic(EdgeMixin, SlapOSInstanceTestCase): ...@@ -344,6 +344,7 @@ class TestEdgeBasic(EdgeMixin, SlapOSInstanceTestCase):
INTERVAL = 120 INTERVAL = 120
TIMEOUT = 7 TIMEOUT = 7
SQLITE = %(db_file)s SQLITE = %(db_file)s
ELAPSED_FAST = 5
NAMESERVER = NAMESERVER =
127.0.1.1 127.0.1.1
127.0.1.2 127.0.1.2
...@@ -363,6 +364,7 @@ URL = ...@@ -363,6 +364,7 @@ URL =
INTERVAL = 120 INTERVAL = 120
TIMEOUT = 13 TIMEOUT = 13
SQLITE = %(db_file)s SQLITE = %(db_file)s
ELAPSED_FAST = 11
NAMESERVER = NAMESERVER =
127.0.1.1 127.0.1.1
127.0.1.2 127.0.1.2
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment