Skip to content

slapos
slapos
Commit ea264312 authored by Łukasz Nowak's avatar Łukasz Nowak
1 Browse files
Options

Revert "Monitor edge testing" 

This reverts merge request !660

/reviewed-on nexedi/slapos!671
parent 16931754
Pipeline #7163 failed with stage
    Expand all Show whitespace changes
    Inline Side-by-side
    Showing with 108 additions and 854 deletions
    component/surykatka/buildout.cfg deleted 100644 → 0
    View file @ 16931754
    [buildout]
    extends =
    buildout.hash.cfg
    ../python3/buildout.cfg
    parts =
    surykatka
    [surykatka-requirements]
    recipe = slapos.recipe.build:download
    url = ${:_profile_base_location_}/${:_update_hash_filename_}
    [surykatka]
    recipe = plone.recipe.command
    command =
    bash -c "${python3.7:executable} -m venv ${:location} && \
    . ${:location}/bin/activate && \
    pip install -r ${surykatka-requirements:target}"
    location = ${buildout:parts-directory}/${:_buildout_section_name_}
    stop-on-error = true
    executable = ${:location}/bin/surykatka
    component/surykatka/buildout.hash.cfg deleted 100644 → 0
    View file @ 16931754
    # THIS IS NOT A BUILDOUT FILE, despite purposedly using a compatible syntax.
    # The only allowed lines here are (regexes):
    # - "^#" comments, copied verbatim
    # - "^[" section beginings, copied verbatim
    # - lines containing an "=" sign which must fit in the following categorie.
    # - "^\s*filename\s*=\s*path\s*$" where "path" is relative to this file
    # Copied verbatim.
    # - "^\s*hashtype\s*=.*" where "hashtype" is one of the values supported
    # by the re-generation script.
    # Re-generated.
    # - other lines are copied verbatim
    # Substitution (${...:...}), extension ([buildout] extends = ...) and
    # section inheritance (< = ...) are NOT supported (but you should really
    # not need these here).
    [surykatka-requirements]
    _update_hash_filename_ = requirements.txt
    md5sum = 897c9a296625b576817f2a1dc1801a90
    component/surykatka/requirements.txt deleted 100644 → 0
    View file @ 16931754
    certifi==2019.11.28
    chardet==3.0.4
    Click==7.0
    dnspython==1.16.0
    forcediphttpsadapter==1.0.1
    idna==2.8
    miniupnpc==2.0.2
    peewee==3.13.1
    requests==2.22.0
    surykatka==0.1.1
    urllib3==1.25.7
    software/monitor/README.edgetest.rst deleted 100644 → 0
    View file @ 16931754
    ============
    Edge testing
    ============
    ``edgetest`` is a special software type of monitor software release used for website monitoring by using bots.
    It uses `surykatka <https://lab.nexedi.com/nexedi/surykatka>`_ and `check_surykatka_json <https://lab.nexedi.com/nexedi/slapos.toolbox/blob/master/slapos/promise/plugin/check_surykatka_json.py>`_ to monitor websites.
    ``surykatka`` provides a bot to query list of hosts and a JSON reporting system.
    ``check_surykatka_json`` is used in promises to provide monitoring information about the websites.
    In order to monitor an url one need to:
    * request a monitor software release with ``edgetest`` software type, configured as described in ``instance-edgetest-input-schema.json``,
    * request a slave to monitor with ``edgetest`` software type, configured as described in ``instance-edgetest-slave-input-schema.json``.
    software/monitor/buildout.hash.cfg
    View file @ ea264312
    ...@@ -14,32 +14,16 @@ ...@@ -14,32 +14,16 @@
    # not need these here). # not need these here).
    [template] [template]
    filename = instance.cfg filename = instance.cfg
    md5sum = cb814297f2f76dc8e08014a7d662439f md5sum = 1b7d2d097f208f6641bf98a17df079c8
    [template-monitor] [template-monitor]
    _update_hash_filename_ = instance-monitor.cfg.jinja2 _update_hash_filename_ = instance-monitor.cfg.jinja2
    md5sum = 165a15672fc85981f68b9af2d6253254 md5sum = 373c79480e6425c20480fc911a56c3fd
    [template-monitor-distributor]
    _update_hash_filename_ = instance-monitor-distributor.cfg.jinja2
    md5sum = 61c0bfdfc0a2b51ba15fe4a49baf6091
    [json-test-template] [json-test-template]
    _update_hash_filename_ = json-test-template.json.in.jinja2 _update_hash_filename_ = json-test-template.json.in.jinja2
    md5sum = 2eb5596544d9c341acf653d4f7ce2680 md5sum = 2eb5596544d9c341acf653d4f7ce2680
    [template-monitor-edgetest]
    _update_hash_filename_ = instance-monitor-edgetest.cfg.jinja2
    md5sum = 9e237dbdda59e788202f0da194a57d41
    [template-monitor-edgebot]
    _update_hash_filename_ = instance-monitor-edgebot.cfg.jinja2
    md5sum = cd4c5d2ecf8285ea8f0905ed1150d8a0
    [network-bench-cfg]
    filename = network_bench.cfg.in
    md5sum = cfcbf2002b8eff5153e2bf68ed24b720
    [monitor-collect-csv-dump]
    filename = script/collect_csv_dump.py
    md5sum = cad2402bbd21907cfed6bc5af8c5d3ab
    [template-surykatka-ini]
    _update_hash_filename_ = surykatka.ini.jinja2
    md5sum = 40870921e05d93b5843ab34abd7e3902
    software/monitor/instance-default-input-schema.json deleted 100644 → 0
    View file @ 16931754
    {
    "$schema": "http://json-schema.org/draft-04/schema#",
    "properties": {
    "dummy": {
    "title": "dummy",
    "description": "Dummy",
    "type": "string"
    }
    }
    }
    software/monitor/instance-default-output-schema.json deleted 100644 → 0
    View file @ 16931754
    {
    "$schema": "http://json-schema.org/draft-04/schema#",
    "description": "Values returned by Re6st Master instanciation",
    "properties": {
    "re6stry-url": {
    "description": "ipv6 url to access your re6st registry service",
    "type": "string"
    }
    },
    "type": "object"
    }
    software/monitor/instance-edgetest-input-schema.json deleted 100644 → 0
    View file @ 16931754
    {
    "$schema": "http://json-schema.org/draft-04/schema#",
    "properties": {
    "nameserver": {
    "default": "",
    "title": "Nameserver",
    "description": "Space separated list of name servers to use.",
    "type": "string"
    },
    "check-status-code": {
    "default": "200",
    "title": "Default Check HTTP Code",
    "description": "Default HTTP code to check against (default: 200).",
    "type": "string"
    },
    "check-frontend-ip": {
    "default": "",
    "title": "Default space separated list of Frontend IPs to check",
    "description": "Default list of Frontend IPs to check, if empty no constraint is used.",
    "type": "string"
    }
    }
    }
    software/monitor/instance-edgetest-slave-input-schema.json deleted 100644 → 0
    View file @ 16931754
    {
    "$schema": "http://json-schema.org/draft-04/schema#",
    "properties": {
    "url": {
    "title": "URL to check",
    "description": "URL to check, like https://example.com",
    "type": "string"
    },
    "check-status-code": {
    "default": "Master default",
    "title": "Default Check HTTP Code.",
    "description": "HTTP code to check against (default: comes from master partition).",
    "type": "string"
    },
    "check-frontend-ip": {
    "default": "Master default",
    "title": "Space separated list of Frontend IPs to check",
    "description": "List of Frontend IPs to check, if empty no constraint is used (default: comes from master partition).",
    "type": "string"
    }
    }
    }
    software/monitor/instance-monitor-distributor.cfg.jinja2 0 → 100644
    View file @ ea264312
    [jinja2-template-base]
    recipe = slapos.recipe.template:jinja2
    rendered = ${buildout:directory}/${:filename}
    extra-context =
    context =
    import json_module json
    ${:extra-context}
    [slave-test-configuration]
    <=jinja2-template-base
    template = {{ template_json_distributor_test }}
    filename = srv/monitor/private/test.json
    extensions = jinja2.ext.do
    extra-context =
    section slave_information slap-configuration
    {% set part_list = [] -%}
    # Publish information for each slave
    {% set directory_list = [] -%}
    {% for slave_instance in slave_instance_list -%}
    {% set publish_section_title = 'publish-%s' % slave_instance.get('slave_reference') -%}
    {% do part_list.append(publish_section_title) -%}
    [{{ publish_section_title }}]
    recipe = slapos.cookbook:publish
    -slave-reference = {{ slave_instance.get('slave_reference') }}
    log-access-url = ${monitor-frontend:connection-site_url}/{{ slave_instance.get('slave_reference') }}
    log-access-url-v6 = ${monitor-httpd-conf-parameter:url}/{{ slave_instance.get('slave_reference') }}
    {% endfor %}
    {% set data_source_dict = slapparameter_dict.get('data-source', None) -%}
    {% set cron_min_count = 0 -%}
    {% if data_source_dict %}
    {% for entry in data_source_dict -%}
    {% set cron_min_count = cron_min_count + 1 -%}
    {% set cron_min = cron_min_count%60 -%}
    {% do part_list.append('cron-crawl-' + entry) -%}
    {% do directory_list.append(entry) -%}
    [cron-crawl-{{ entry }}]
    <= cron
    recipe = slapos.cookbook:cron.d
    name = cron-crawler-{{ entry }}
    frequency = * * * * *
    command = cd ${monitor-directory:crawl-log}/{{ entry }} && ${crawler-bin:wrapper-path} {{ data_source_dict.get(entry) }}
    {% endfor %}
    {% endif %}
    [monitor-directory]
    crawl-log = ${:srv}/crawlog
    network-user-logs = ${:private}/network-user-logs/
    {% for slave_instance in slave_instance_list -%}
    user-log-{{ slave_instance.get('slave_reference') }}-folder = ${:private}/network-user-logs/{{ slave_instance.get('slave_reference') }}
    user-log-{{ slave_instance.get('slave_reference') }}-ping-folder = ${:private}/network-user-logs/{{ slave_instance.get('slave_reference') }}/ping
    user-log-{{ slave_instance.get('slave_reference') }}-ping6-folder = ${:private}/network-user-logs/{{ slave_instance.get('slave_reference') }}/ping6
    {% endfor -%}
    {% for directory in directory_list %}
    {{ '%s = ${:crawl-log}/%s' % (directory, directory) }}
    {% endfor %}
    [crawler-bin]
    recipe = slapos.cookbook:wrapper
    command-line =
    {{ wget_bin }} --no-check-certificate -l1 -r -nd --timestamp
    wrapper-path = ${monitor-directory:bin}/log-crawler
    [buildout]
    extends = {{ instance_base_monitor }}
    parts +=
    slave-test-configuration
    {% for part in part_list %}
    {{ ' %s' % part }}
    {% endfor %}
    software/monitor/instance-monitor-edgebot.cfg.jinja2 deleted 100644 → 0
    View file @ 16931754
    {%- if slap_software_type == software_type %}
    {%- set CONFIGURATION = {} %}
    {%- for k, v in sorted(slap_configuration.items()) %}
    {%- if k.startswith('configuration.') %}
    {%- do CONFIGURATION.__setitem__(k[14:], v) %}
    {%- endif %}
    {%- endfor %}
    {%- set slave_instance_list = [] %}
    {%- set extra_slave_instance_list = slapparameter_dict.get('extra_slave_instance_list') %}
    {%- if extra_slave_instance_list %}
    {#- Create slaves to process with setting up defaults #}
    {%- for slave in sorted(json_module.loads(extra_slave_instance_list)) %}
    {%- if 'check-status-code' not in slave %}
    {%- do slave.__setitem__('check-status-code', CONFIGURATION['check-status-code']) %}
    {%- endif %}
    {%- if 'check-frontend-ip' not in slave %}
    {%- do slave.__setitem__('check-frontend-ip', CONFIGURATION['check-frontend-ip']) %}
    {%- endif %}
    {%- if 'url' in slave %}
    {%- do slave_instance_list.append(slave) %}
    {%- endif %}
    {%- endfor %}
    {%- endif %}
    {%- set part_list = [] %}
    {%- for slave in sorted(slave_instance_list) %}
    {%- set part_id = 'http-query-' ~ slave['slave_reference'] ~ '-promise' %}
    {%- do part_list.append(part_id) %}
    {%- set safe_name = part_id.replace('_', '').replace('.', '-').replace(' ', '-') %}
    [{{part_id}}]
    <= monitor-promise-base
    module = check_surykatka_json
    name = {{ safe_name }}.py
    config-report = http_query
    config-url = {{ slave['url'] }}
    config-status-code = {{ slave['check-status-code'] }}
    config-ip-list = {{ slave['check-frontend-ip'] }}
    config-json-file = ${surykatka-config:json}
    {% endfor %}
    [surykatka-bot-promise]
    <= monitor-promise-base
    module = check_surykatka_json
    name = surykatka-bot-promise.py
    config-report = bot_status
    config-json-file = ${surykatka-config:json}
    [buildout]
    extends = {{ monitor_template_output }}
    parts =
    cron
    cron-entry-surykatka-status
    monitor-base
    publish-connection-information
    surykatka
    surykatka-bot-promise
    {% for part_id in sorted(part_list) %}
    {{ part_id }}
    {% endfor %}
    eggs-directory = {{ eggs_directory }}
    develop-eggs-directory = {{ develop_eggs_directory }}
    offline = true
    [surykatka-config]
    recipe = slapos.recipe.template:jinja2
    db = ${directory:srv}/surykatka.db
    rendered = ${directory:etc}/surykatka.ini
    template = {{ template_surykatka_ini }}
    slave_instance_list = {{ dumps(slave_instance_list) }}
    nameserver = {{ dumps(CONFIGURATION['nameserver']) }}
    json = ${directory:srv}/surykatka.json
    context =
    import json_module json
    key db :db
    key nameserver :nameserver
    key slave_instance_list :slave_instance_list
    [surykatka]
    recipe = slapos.cookbook:wrapper
    config = ${surykatka-config:rendered}
    command-line =
    {{ surykatka_binary }} --run crawl --reload --configuration ${:config}
    wrapper-path = ${monitor-directory:service}/${:_buildout_section_name_}
    hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
    [surykatka-status-json]
    recipe = slapos.recipe.template:jinja2
    template = inline:#!/bin/sh
    if {{ surykatka_binary }} --run status --configuration ${surykatka:config} --output json > ${surykatka-config:json}.tmp ; then
    mv -f ${surykatka-config:json}.tmp ${surykatka-config:json}
    else
    rm -f ${surykatka-config:json}.tmp
    fi
    rendered = ${monitor-directory:bin}/${:_buildout_section_name_}
    mode = 0755
    [cron-entry-surykatka-status]
    recipe = slapos.cookbook:cron.d
    cron-entries = ${directory:etc}/cron.d
    name = surykatka-status
    frequency = */2 * * * *
    command = ${surykatka-status-json:rendered}
    [publish-connection-information]
    recipe = slapos.cookbook:publish.serialised
    monitor-base-url = ${monitor-publish-parameters:monitor-base-url}
    monitor-url = ${monitor-publish-parameters:monitor-url}
    monitor-user = ${monitor-publish-parameters:monitor-user}
    monitor-password = ${monitor-publish-parameters:monitor-password}
    [monitor-instance-parameter]
    monitor-httpd-port = {{ slapparameter_dict['monitor-httpd-port'] }}
    cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
    {% if slapparameter_dict.get('monitor-username', '') -%}
    username = {{ slapparameter_dict['monitor-username'] }}
    {% endif -%}
    {% if slapparameter_dict.get('monitor-password', '') -%}
    password = {{ slapparameter_dict['monitor-password'] }}
    {% endif -%}
    interface-url = {{ slapparameter_dict.get('monitor-interface-url', 'https://monitor.app.officejs.com') }}
    [monitor-directory]
    service = ${buildout:directory}/etc/service
    var = ${buildout:directory}/var
    srv = ${buildout:directory}/srv
    server-log = ${:private}/server-log
    monitor-log = ${:private}/monitor-log
    [slap-configuration]
    recipe = slapos.cookbook:slapconfiguration.serialised
    computer = ${slap-connection:computer-id}
    partition = ${slap-connection:partition-id}
    url = ${slap-connection:server-url}
    key = ${slap-connection:key-file}
    cert = ${slap-connection:cert-file}
    [slap-parameter]
    {%- endif %}
    software/monitor/instance-monitor-edgetest.cfg.jinja2 deleted 100644 → 0
    View file @ 16931754
    {%- if slap_software_type == software_type %}
    [jinja2-template-base]
    recipe = slapos.recipe.template:jinja2
    rendered = ${buildout:directory}/${:filename}
    extra-context =
    context =
    import json_module json
    ${:extra-context}
    [slave-test-configuration]
    <=jinja2-template-base
    template = {{ template_json_edgetest_test }}
    filename = srv/monitor/private/test.json
    extensions = jinja2.ext.do
    extra-context =
    section slave_information slap-configuration
    {% set part_list = [] -%}
    # Publish information for each slave
    {%- set edgebot_software_type = 'edgebot' %}
    {%- set edgebot_quantity = slapparameter_dict.pop('edgebot-quantity', '1') | int %}
    {%- set edgebot_list = [] %}
    {%- set edgebot_section_list = [] %}
    {%- set slave_list_name = 'extra_slave_instance_list' %}
    {%- set request_dict = {} %}
    {%- set namebase = "edgebot" %}
    {%- set authorized_slave_list = [] %}
    {%- set monitor_base_url_dict = {} -%}
    {%- for slave in sorted(slave_instance_list) %}
    {%- do authorized_slave_list.append(slave) %}
    {%- endfor %}
    {%- set monitor_base_port = int(slap_configuration['configuration.monitor-base-port']) %}
    {%- for i in range(1, edgebot_quantity + 1) %}
    {%- set edgebot_name = "%s-%s" % (namebase, i) %}
    {%- set request_section_title = 'request-%s' % edgebot_name %}
    {%- do edgebot_list.append(edgebot_name) %}
    {%- do edgebot_section_list.append(request_section_title) %}
    {%- do part_list.append(request_section_title) %}
    {%- do request_dict.__setitem__(request_section_title,
    {
    'config': {'monitor-httpd-port': monitor_base_port + i},
    'name': edgebot_name,
    'sla': {},
    'state': 'started',
    }) %}
    {%- endfor %}
    [replicate]
    <= slap-connection
    recipe = slapos.cookbook:request.serialised
    config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
    config-monitor-username = ${monitor-instance-parameter:username}
    config-monitor-password = ${monitor-htpasswd:passwd}
    software-url = ${slap-connection:software-release-url}
    software-type = {{edgebot_software_type}}
    return = monitor-base-url
    {% for section, edgebot_request in request_dict.iteritems() %}
    [{{section}}]
    <= replicate
    name = {{ edgebot_request.get('name') }}
    {%- if edgebot_request.get('state') %}
    state = {{ edgebot_request.get('state') }}
    {%- endif%}
    {%- set slave_configuration_dict = slapparameter_dict %}
    {%- do slave_configuration_dict.update(edgebot_request.get('config')) %}
    {%- do slave_configuration_dict.__setitem__(slave_list_name, json_module.dumps(authorized_slave_list)) %}
    {%- for config_key, config_value in slave_configuration_dict.iteritems() %}
    config-{{ config_key }} = {{ dumps(config_value) }}
    {% endfor -%}
    {%- if edgebot_request.get('sla') %}
    {%- for parameter, value in edgebot_request.get('sla').iteritems() %}
    sla-{{ parameter }} = {{ value }}
    {%- endfor %}
    {%- else %}
    # As no SLA was provided, by default it is requested on the same computer
    sla-computer_guid = ${slap-connection:computer-id}
    {% endif %}
    {%- do monitor_base_url_dict.__setitem__(section, '${' ~ section ~ ':connection-monitor-base-url}') -%}
    {%- endfor %}
    {%- set directory_list = [] -%}
    {%- for slave_instance in slave_instance_list -%}
    {%- set publish_section_title = 'publish-%s' % slave_instance.get('slave_reference') -%}
    {%- do part_list.append(publish_section_title) %}
    [{{ publish_section_title }}]
    recipe = slapos.cookbook:publish
    -slave-reference = {{ slave_instance.get('slave_reference') }}
    {% endfor %}
    [monitor-conf-parameters]
    monitor-title = Monitor
    password = ${monitor-htpasswd:passwd}
    [monitor-base-url-dict]
    {% for key, value in monitor_base_url_dict.items() -%}
    {{ key }} = {{ value }}
    {% endfor %}
    [buildout]
    extends = {{ instance_base_monitor }}
    parts +=
    slave-test-configuration
    {% for part in part_list %}
    {{ ' %s' % part }}
    {%- endfor %}
    {%- endif %}
    software/monitor/instance-monitor.cfg.jinja2
    View file @ ea264312
    ...@@ -57,15 +57,14 @@ recipe = slapos.cookbook:generate.password ...@@ -57,15 +57,14 @@ recipe = slapos.cookbook:generate.password
    user = admin user = admin
    bytes = 16 bytes = 16
    [monitor-instance-parameter]
    monitor-httpd-port = {{ slap_configuration['configuration.monitor-base-port'] }}
    [monitor-directory] [monitor-directory]
    service = ${buildout:directory}/etc/service service = ${buildout:directory}/etc/service
    var = ${buildout:directory}/var var = ${buildout:directory}/var
    srv = ${buildout:directory}/srv srv = ${buildout:directory}/srv
    server-log = ${:private}/server-log server-log = ${:private}/server-log
    monitor-log = ${:private}/monitor-log monitor-log = ${:private}/monitor-log
    cache = ${:var}/cache
    mod-ssl = ${:cache}/httpd_mod_ssl
    system-log = ${:private}/system-log system-log = ${:private}/system-log
    consumption = ${:log}/consumption consumption = ${:log}/consumption
    ......
    software/monitor/instance.cfg
    View file @ ea264312
    ...@@ -8,65 +8,38 @@ develop-eggs-directory = ${buildout:develop-eggs-directory} ...@@ -8,65 +8,38 @@ develop-eggs-directory = ${buildout:develop-eggs-directory}
    [switch_softwaretype] [switch_softwaretype]
    recipe = slapos.cookbook:softwaretype recipe = slapos.cookbook:softwaretype
    default = $${instance-base-monitor:rendered} default = $${instance-base-monitor:rendered}
    edgetest = $${instance-base-edgetest:rendered} distributor = $${instance-base-distributor:rendered}
    edgebot = $${instance-base-edgebot:rendered}
    [instance-base-monitor] [instance-base-monitor]
    recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
    template = ${template-monitor:target} template = ${template-monitor:destination}
    rendered = $${buildout:directory}/template-base-monitor.cfg rendered = $${buildout:directory}/template-base-monitor.cfg
    extensions = jinja2.ext.do extensions = jinja2.ext.do
    context = key develop_eggs_directory buildout:develop-eggs-directory context = key develop_eggs_directory buildout:develop-eggs-directory
    key eggs_directory buildout:eggs-directory key eggs_directory buildout:eggs-directory
    key slapparameter_dict slap-configuration:configuration key slapparameter_dict slap-configuration:configuration
    section slap_configuration slap-configuration
    raw buildout_bin ${buildout:bin-directory} raw buildout_bin ${buildout:bin-directory}
    raw monitor_template_output ${monitor-template:output} raw monitor_template_output ${monitor-template:output}
    raw network_benck_cfg_output ${network-bench-cfg:output} raw network_benck_cfg_output ${network-bench-cfg:output}
    raw monitor_collect_csv_dump ${monitor-collect-csv-dump:output} raw monitor_collect_csv_dump ${monitor-collect-csv-dump:output}
    mode = 0644 mode = 0644
    [instance-base-edgetest] [instance-base-distributor]
    recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
    template = ${template-monitor-edgetest:target} template = ${template-monitor-distributor:destination}
    rendered = $${buildout:directory}/template-monitor-base-edgetest.cfg rendered = $${buildout:directory}/template-monitor-base-distributor.cfg
    extensions = jinja2.ext.do extensions = jinja2.ext.do
    context = import json_module json context = import json_module json
    key develop_eggs_directory buildout:develop-eggs-directory key develop_eggs_directory buildout:develop-eggs-directory
    key eggs_directory buildout:eggs-directory key eggs_directory buildout:eggs-directory
    key slapparameter_dict slap-configuration:configuration key slapparameter_dict slap-configuration:configuration
    key slap_software_type slap-configuration:slap-software-type
    section slap_configuration slap-configuration
    raw software_type edgetest
    key instance_base_monitor instance-base-monitor:rendered key instance_base_monitor instance-base-monitor:rendered
    key slave_instance_list slap-configuration:slave-instance-list key slave_instance_list slap-configuration:slave-instance-list
    raw buildout_bin ${buildout:bin-directory} raw buildout_bin ${buildout:bin-directory}
    raw template_json_edgetest_test ${json-test-template:target} raw template_json_distributor_test ${json-test-template:destination}
    raw wget_bin ${wget:location}/bin/wget
    mode = 0644 mode = 0644
    [instance-base-edgebot]
    recipe = slapos.recipe.template:jinja2
    template = ${template-monitor-edgebot:target}
    rendered = $${buildout:directory}/template-monitor-edgebot.cfg
    extensions = jinja2.ext.do
    surykatka-binary = ${surykatka:executable}
    template-surykatka-ini = ${template-surykatka-ini:target}
    context = import json_module json
    key develop_eggs_directory buildout:develop-eggs-directory
    key eggs_directory buildout:eggs-directory
    section slap_configuration slap-configuration
    key slapparameter_dict slap-configuration:configuration
    key slap_software_type slap-configuration:slap-software-type
    raw software_type edgebot
    key surykatka_binary :surykatka-binary
    key template_surykatka_ini :template-surykatka-ini
    raw buildout_bin ${buildout:bin-directory}
    raw monitor_template_output ${monitor-template:output}
    raw monitor_collect_csv_dump ${monitor-collect-csv-dump:output}
    mode = 0644
    [slap-configuration] [slap-configuration]
    recipe = slapos.cookbook:slapconfiguration.serialised recipe = slapos.cookbook:slapconfiguration.serialised
    computer = $${slap-connection:computer-id} computer = $${slap-connection:computer-id}
    ...@@ -74,12 +47,3 @@ partition = $${slap-connection:partition-id} ...@@ -74,12 +47,3 @@ partition = $${slap-connection:partition-id}
    url = $${slap-connection:server-url} url = $${slap-connection:server-url}
    key = $${slap-connection:key-file} key = $${slap-connection:key-file}
    cert = $${slap-connection:cert-file} cert = $${slap-connection:cert-file}
    # Defaults
    configuration.check-status-code = 200
    configuration.nameserver =
    configuration.check-frontend-ip =
    # use monitor-base-port to have monitor listening on each instance
    # on different port and also on different port than other services
    # it makes it possible to instantiate it correctly on signle IP, for
    # example in case of webrunner
    configuration.monitor-base-port = 9700
    software/monitor/software.cfg
    View file @ ea264312
    ...@@ -4,16 +4,17 @@ extends = ...@@ -4,16 +4,17 @@ extends =
    buildout.hash.cfg buildout.hash.cfg
    ../../component/pycurl/buildout.cfg ../../component/pycurl/buildout.cfg
    ../../component/python-cryptography/buildout.cfg ../../component/python-cryptography/buildout.cfg
    ../../component/surykatka/buildout.cfg ../../component/wget/buildout.cfg
    ../../stack/monitor/buildout.cfg ../../stack/monitor/buildout.cfg
    ../../stack/slapos.cfg ../../stack/slapos.cfg
    parts = parts =
    wget
    slapos-cookbook slapos-cookbook
    network-bench-cfg network-bench-cfg
    json-test-template json-test-template
    template template
    template-monitor-edgetest template-monitor-distributor
    template-monitor template-monitor
    monitor-collect-csv-dump monitor-collect-csv-dump
    ...@@ -26,31 +27,26 @@ mode = 0644 ...@@ -26,31 +27,26 @@ mode = 0644
    [template-monitor] [template-monitor]
    recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
    url = ${:_profile_base_location_}/${:_update_hash_filename_} url = ${:_profile_base_location_}/${:_update_hash_filename_}
    destination = ${buildout:directory}/template-base-monitor.cfg
    mode = 0644 mode = 0644
    [template-monitor-edgetest] [template-monitor-distributor]
    recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
    url = ${:_profile_base_location_}/${:_update_hash_filename_} url = ${:_profile_base_location_}/${:_update_hash_filename_}
    destination = ${buildout:directory}/template-monitor-base-distributor.cfg
    mode = 0644 mode = 0644
    [template-monitor-edgebot]
    recipe = slapos.recipe.build:download
    url = ${:_profile_base_location_}/${:_update_hash_filename_}
    mode = 0644
    [template-surykatka-ini]
    recipe = slapos.recipe.build:download
    url = ${:_profile_base_location_}/${:_update_hash_filename_}
    [json-test-template] [json-test-template]
    recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
    url = ${:_profile_base_location_}/${:_update_hash_filename_} url = ${:_profile_base_location_}/${:_update_hash_filename_}
    destination = ${buildout:directory}/json-test-template.json.in.jinja2
    mode = 0644 mode = 0644
    [network-bench-cfg] [network-bench-cfg]
    recipe = slapos.recipe.template recipe = slapos.recipe.template
    url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/network_bench.cfg.in
    output = ${buildout:parts-directory}/${:_buildout_section_name_} md5sum = cfcbf2002b8eff5153e2bf68ed24b720
    output = ${buildout:directory}/template-network-bench-cfg.in
    mode = 0644 mode = 0644
    [monitor-collect-csv-dump] [monitor-collect-csv-dump]
    ...@@ -58,6 +54,7 @@ mode = 0644 ...@@ -58,6 +54,7 @@ mode = 0644
    url = ${:_profile_base_location_}/script/${:filename} url = ${:_profile_base_location_}/script/${:filename}
    filename = collect_csv_dump.py filename = collect_csv_dump.py
    output = ${:destination}/${:filename} output = ${:destination}/${:filename}
    md5sum = cad2402bbd21907cfed6bc5af8c5d3ab
    [extra-eggs] [extra-eggs]
    <= monitor-eggs <= monitor-eggs
    ...@@ -86,5 +83,6 @@ eggs += ...@@ -86,5 +83,6 @@ eggs +=
    hexagonit.recipe.download hexagonit.recipe.download
    plone.recipe.command plone.recipe.command
    [versions] [versions]
    slapos.recipe.template = 4.3 slapos.recipe.template = 4.3
    software/monitor/software.cfg.json deleted 100644 → 0
    View file @ 16931754
    {
    "name": "Monitor",
    "description": "Software release for Monitoring purpose",
    "serialisation": "xml",
    "software-type": {
    "default": {
    "title": "Default",
    "description": "Standalone Monitor",
    "request": "instance-default-input-schema.json",
    "response": "instance-default-output-schema.json",
    "index": 0
    },
    "edgetest": {
    "title": "Edge Test",
    "description": "Cluster of bots to perform a distributed monitoring ",
    "request": "instance-edgetest-input-schema.json",
    "response": "instance-default-output-schema.json",
    "index": 1
    },
    "edgetest-slave": {
    "title": "Edge Test Slave",
    "software-type": "edgetest",
    "description": "Cluster of bots to perform a distributed monitoring ",
    "request": "instance-edgetest-slave-input-schema.json",
    "response": "instance-default-output-schema.json",
    "index": 2
    }
    }
    }
    software/monitor/surykatka.ini.jinja2 deleted 100644 → 0
    View file @ 16931754
    [SURYKATKA]
    INTERVAL = 120
    SQLITE = {{ db }}
    {%- set nameserver_list = nameserver.split() %}
    {%- if len(nameserver_list) > 0 %}
    NAMESERVER =
    {%- for nameserver_entry in sorted(nameserver_list) %}
    {{ nameserver_entry }}
    {%- endfor %}
    {% endif %}
    URL =
    {%- for slave in sorted(slave_instance_list) %}
    {%- if 'url' in slave %}
    {{ slave['url'] }}
    {%- endif -%}
    {% endfor %}
    software/monitor/test/test.py
    View file @ ea264312
    This diff is collapsed.
    stack/slapos.cfg
    View file @ ea264312
    ...@@ -144,7 +144,7 @@ slapos.libnetworkcache = 0.20 ...@@ -144,7 +144,7 @@ slapos.libnetworkcache = 0.20
    slapos.rebootstrap = 4.2 slapos.rebootstrap = 4.2
    slapos.recipe.build = 0.42 slapos.recipe.build = 0.42
    slapos.recipe.cmmi = 0.12 slapos.recipe.cmmi = 0.12
    slapos.toolbox = 0.101 slapos.toolbox = 0.100
    stevedore = 1.21.0 stevedore = 1.21.0
    subprocess32 = 3.5.3 subprocess32 = 3.5.3
    unicodecsv = 0.14.1 unicodecsv = 0.14.1
    ......
    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
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7