Commit 4867d69c authored by Łukasz Nowak's avatar Łukasz Nowak

Update Release Candidate

parents 6c4d92e9 7bc19d84
...@@ -16,8 +16,6 @@ extends = ...@@ -16,8 +16,6 @@ extends =
../../component/nginx/buildout.cfg ../../component/nginx/buildout.cfg
../../stack/caucase/buildout.cfg ../../stack/caucase/buildout.cfg
# Monitoring stack (keep on bottom)
../../stack/monitor/buildout.cfg
parts += parts +=
caucase-eggs caucase-eggs
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
extends = extends =
buildout.hash.cfg buildout.hash.cfg
../../stack/caucase/buildout.cfg ../../stack/caucase/buildout.cfg
# Monitoring stack (keep on bottom)
../../stack/monitor/buildout.cfg
parts += parts +=
instance instance
......
...@@ -26,7 +26,7 @@ md5sum = 20c37ea06a8fa405bc02470d5115fd11 ...@@ -26,7 +26,7 @@ md5sum = 20c37ea06a8fa405bc02470d5115fd11
[template-dns-replicate] [template-dns-replicate]
_update_hash_filename_ = instance-powerdns-replicate.cfg.jinja2 _update_hash_filename_ = instance-powerdns-replicate.cfg.jinja2
md5sum = 72ce30bee3b8a9da8ac9be7eb65d83a2 md5sum = 504d15f0bbf0e515d5ff16070f1ac802
[iso-list] [iso-list]
_update_hash_filename_ = template/zz.countries.nexedi.dk.rbldnsd _update_hash_filename_ = template/zz.countries.nexedi.dk.rbldnsd
......
...@@ -122,22 +122,16 @@ config-monitor-username = admin ...@@ -122,22 +122,16 @@ config-monitor-username = admin
config-monitor-password = ${monitor-htpasswd:passwd} config-monitor-password = ${monitor-htpasswd:passwd}
[publish-information] [publish-information]
<= monitor-publish
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
slave-amount = {{ slave_instance_list | length }} slave-amount = {{ slave_instance_list | length }}
ns-record = {{ ns_record }} ns-record = {{ ns_record }}
monitor-url = ${monitor-publish-parameters:monitor-url}
monitor-user = ${monitor-publish-parameters:monitor-user}
monitor-password = ${monitor-publish-parameters:monitor-password}
{% for dns_name, dns_section in zip(dns_list, dns_section_list) -%} {% for dns_name, dns_section in zip(dns_list, dns_section_list) -%}
{% set dns_ipv6 = '${' ~ dns_section ~ ':connection-powerdns-ipv6}' -%} {% set dns_ipv6 = '${' ~ dns_section ~ ':connection-powerdns-ipv6}' -%}
{% set dns_port = '${' ~ dns_section ~ ':connection-powerdns-port}' -%} {% set dns_port = '${' ~ dns_section ~ ':connection-powerdns-port}' -%}
{{ dns_name }}-ipv6 = {{ dns_ipv6 }} {{ dns_name }}-ipv6 = {{ dns_ipv6 }}
{{ dns_name }}-port = {{ dns_port }} {{ dns_name }}-port = {{ dns_port }}
{% endfor -%} {% endfor -%}
{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.app.officejs.com') -%}
{% if monitor_interface_url -%}
monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${monitor-publish-parameters:monitor-url}
{% endif -%}
[buildout] [buildout]
......
...@@ -32,6 +32,7 @@ import http.client ...@@ -32,6 +32,7 @@ import http.client
import os import os
import requests import requests
import unittest import unittest
import urllib
from slapos.recipe.librecipe import generateHashFromFiles from slapos.recipe.librecipe import generateHashFromFiles
from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
...@@ -130,11 +131,19 @@ class TestMonitorAccess(PowerDNSTestCase): ...@@ -130,11 +131,19 @@ class TestMonitorAccess(PowerDNSTestCase):
def test(self): def test(self):
connection_parameter_dict = self.requestDefaultInstance()\ connection_parameter_dict = self.requestDefaultInstance()\
.getConnectionParameterDict() .getConnectionParameterDict()
monitor_base_url = connection_parameter_dict.get('monitor-url') # special parsing of monitor-setup-url as the URLs there are not really
# still, this test does not really check the real monitor-setup-url
# but this seems good enough
monitor_setup_url = connection_parameter_dict['monitor-setup-url']
monitor_base_url = connection_parameter_dict['monitor-base-url']
monitor_url_with_auth = 'https' + monitor_setup_url.split('https')[2]
parsed_monitor_url = urllib.parse.urlparse(monitor_url_with_auth)
auth = urllib.parse.parse_qs(parsed_monitor_url.path)
result = requests.get( result = requests.get(
monitor_base_url, verify=False, auth=( monitor_base_url, verify=False, auth=(
connection_parameter_dict.get('monitor-user'), auth['username'][0],
connection_parameter_dict.get('monitor-password') auth['password'][0]
) )
) )
...@@ -196,11 +205,11 @@ class PowerDNSSlaveTestCase(PowerDNSTestCase): ...@@ -196,11 +205,11 @@ class PowerDNSSlaveTestCase(PowerDNSTestCase):
message.use_edns(options=[client_subnet_option]) message.use_edns(options=[client_subnet_option])
answer = dns.query.udp(message, self._ipv6_address, port=DNS_PORT) answer = dns.query.udp(message, self._ipv6_address, port=DNS_PORT)
return answer.get_rrset( return answer.get_rrset(
dns.message.ANSWER, dns.message.ANSWER,
dns.name.from_text(domain_name), dns.name.from_text(domain_name),
dns.rdataclass.IN, dns.rdataclass.IN,
dns.rdatatype.CNAME dns.rdatatype.CNAME
).to_text().split()[-1] ).to_text().split()[-1]
def _test_dns_resolver(self): def _test_dns_resolver(self):
slave_parameter_dict_dict = self.getSlaveParameterDictDict() slave_parameter_dict_dict = self.getSlaveParameterDictDict()
...@@ -242,7 +251,8 @@ class PowerDNSSlaveTestCase(PowerDNSTestCase): ...@@ -242,7 +251,8 @@ class PowerDNSSlaveTestCase(PowerDNSTestCase):
self.assertEqual( self.assertEqual(
slave_parameter_dict.get( slave_parameter_dict.get(
region, region,
'%s.%s.' % (default_rr_dict[region], slave_parameter_dict['origin']) '%s.%s.' % (
default_rr_dict[region], slave_parameter_dict['origin'])
), ),
self.dns_query(domain_name, subnet_dict[region]) self.dns_query(domain_name, subnet_dict[region])
) )
......
...@@ -19,7 +19,7 @@ md5sum = a3e4cb7d28daa7816f04359c8aa3445b ...@@ -19,7 +19,7 @@ md5sum = a3e4cb7d28daa7816f04359c8aa3445b
[yarn.lock] [yarn.lock]
filename = yarn.lock filename = yarn.lock
md5sum = e4b8d436916e48d354342894d6ffecb7 md5sum = e9c0f6cc380b53425f521a167c2fdf66
[python-language-server-requirements.txt] [python-language-server-requirements.txt]
filename = python-language-server-requirements.txt filename = python-language-server-requirements.txt
......
This diff is collapsed.
...@@ -24,7 +24,9 @@ for plugin_and_version in '''\ ...@@ -24,7 +24,9 @@ for plugin_and_version in '''\
vscode/handlebars/latest vscode/handlebars/latest
vscode/hlsl/latest vscode/hlsl/latest
vscode/html/latest vscode/html/latest
vscode/html-language-features/latest # latest fails to activate:
# Activating extension 'HTML Language Features (built-in)' failed: The language client requires VS Code version ^1.52.0 but received version 1.50.0
vscode/html-language-features/1.52.1
vscode/ini/latest vscode/ini/latest
vscode/jake/latest vscode/jake/latest
vscode/java/latest vscode/java/latest
...@@ -39,7 +41,7 @@ for plugin_and_version in '''\ ...@@ -39,7 +41,7 @@ for plugin_and_version in '''\
vscode/make/latest vscode/make/latest
vscode/markdown/latest vscode/markdown/latest
# https://github.com/eclipse-theia/theia/issues/7780 # https://github.com/eclipse-theia/theia/issues/7780
vscode/markdown-language-features/1.39.1 vscode/markdown-language-features/1.39.2
vscode/merge-conflict/latest vscode/merge-conflict/latest
vscode/npm/latest vscode/npm/latest
ms-vscode/node-debug/latest ms-vscode/node-debug/latest
...@@ -82,7 +84,7 @@ for plugin_and_version in '''\ ...@@ -82,7 +84,7 @@ for plugin_and_version in '''\
vscjava/vscode-java-test/0.26.0 vscjava/vscode-java-test/0.26.0
ms-python/python/2020.9.112786 ms-python/python/2020.9.112786
perrinjerome/vscode-zc-buildout/latest perrinjerome/vscode-zc-buildout/latest
jebbs/plantuml/2.13.12 jebbs/plantuml/2.14.0
rafaelmaiolla/diff/latest rafaelmaiolla/diff/latest
perrinjerome/git-commit-syntax/latest perrinjerome/git-commit-syntax/latest
perrinjerome/git-rebase-syntax/latest perrinjerome/git-rebase-syntax/latest
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
extends = extends =
buildout.hash.cfg buildout.hash.cfg
../slapos.cfg ../slapos.cfg
../monitor/buildout.cfg
../../component/python-cryptography/buildout.cfg ../../component/python-cryptography/buildout.cfg
parts = parts =
slapos-cookbook slapos-cookbook
......
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