software/ors-amarisoft: fix monitoring

software/lte/instance-enb-epc.jinja2.cfg

@@ -6,7 +6,6 @@ parts =
   directory
   lte-enb-request
   lte-epc-request
-  monitor-base
   publish-connection-information
 
 extends = {{ monitor_template }}
@@ -79,4 +78,4 @@ lte-enb-request =  ${lte-enb-request:connection-monitor-base-url}
 
 [publish-connection-information]
 recipe = slapos.cookbook:publish
-monitor-setup-url = https://monitor.app.officejs.com/#page=settings_configurator&url=${monitor-publish-parameters:monitor-url}&username=${monitor-publish-parameters:monitor-user}&password=${monitor-publish-parameters:monitor-password}
+<= monitor-publish

software/lte/instance-enb.jinja2.cfg

@@ -8,7 +8,6 @@ parts =
   ltelogs
   lte-enb-config
   lte-enb-service
-  monitor-base
   publish-connection-information
 
 extends = {{ monitor_template }}
@@ -95,15 +94,8 @@ rendered = ${directory:etc}/enb.cfg
 
 [publish-connection-information]
 recipe = slapos.cookbook:publish.serialised
-
-{% if slapparameter_dict.get("monitor-password", None) %}
 monitor-base-url = ${monitor-instance-parameter:monitor-base-url}
-{% else %}
-monitor-setup-url = https://monitor.app.officejs.com/#page=settings_configurator&url=${monitor-publish-parameters:monitor-url}&username=${monitor-publish-parameters:monitor-user}&password=${monitor-publish-parameters:monitor-password}
-{% endif %}
 
-{% if slapparameter_dict.get("monitor-password", None) %}
 [monitor-instance-parameter]
-monitor-title = {{ slapparameter_dict['name'] }}
-password = {{ slapparameter_dict['monitor-password'] }}
-{% endif %}
+monitor-title = {{ slapparameter_dict['name'] | string }}
+password = {{ slapparameter_dict['monitor-password'] | string }}

software/lte/instance-gnb-epc.jinja2.cfg

@@ -6,7 +6,6 @@ parts =
   directory
   lte-gnb-request
   lte-epc-request
-  monitor-base
   publish-connection-information
 
 extends = {{ monitor_template }}
@@ -82,4 +81,4 @@ lte-gnb-request =  ${lte-gnb-request:connection-monitor-base-url}
 
 [publish-connection-information]
 recipe = slapos.cookbook:publish
-monitor-setup-url = https://monitor.app.officejs.com/#page=settings_configurator&url=${monitor-publish-parameters:monitor-url}&username=${monitor-publish-parameters:monitor-user}&password=${monitor-publish-parameters:monitor-password}
+<= monitor-publish

software/lte/instance-gnb.jinja2.cfg

@@ -8,7 +8,6 @@ parts =
   ltelogs
   lte-gnb-config
   lte-enb-service
-  monitor-base
   publish-connection-information
 
 extends = {{ monitor_template }}
@@ -95,15 +94,8 @@ rendered = ${directory:etc}/gnb.cfg
 
 [publish-connection-information]
 recipe = slapos.cookbook:publish.serialised
-
-{% if slapparameter_dict.get("monitor-password", None) %}
 monitor-base-url = ${monitor-instance-parameter:monitor-base-url}
-{% else %}
-monitor-setup-url = https://monitor.app.officejs.com/#page=settings_configurator&url=${monitor-publish-parameters:monitor-url}&username=${monitor-publish-parameters:monitor-user}&password=${monitor-publish-parameters:monitor-password}
-{% endif %}
 
-{% if slapparameter_dict.get("monitor-password", None) %}
 [monitor-instance-parameter]
-monitor-title = {{ slapparameter_dict['name'] }}
-password = {{ slapparameter_dict['monitor-password'] }}
-{% endif %}
+monitor-title = {{ slapparameter_dict['name'] | string }}
+password = {{ slapparameter_dict['monitor-password'] | string }}

software/lte/software.cfg

@@ -9,7 +9,6 @@ extends =
 parts +=
   template
   slapos-cookbook
-  monitor2-template
   ltelogs.jinja2.sh
 # copy all configs by default
   mme.jinja2.cfg