now monitoring and log iframes are configurable

Author: Ilija Vukotic

helm/servicex/templates/app/configmap.yaml

@@ -165,3 +165,9 @@ data:
     DID_FINDER_DEFAULT_SCHEME = '{{ $defaultScheme }}'
     VALID_DID_SCHEMES = [ "{{ join "\",\"" $didFinders }}" ]
 
+    {{ if and .Values.logging.logstash.enabled .Values.logging.logstash.monitor }}
+    MONITOR_URL = '{{ tpl .Values.logging.logstash.monitor }}'
+    {{ end }}   
+    {{ if and .Values.logging.logstash.enabled .Values.logging.logstash.logs }}
+    LOGS_URL = '{{ tpl .Values.logging.logstash.logs }}'
+    {{ end }}   

helm/servicex/values.yaml

@@ -62,6 +62,8 @@ logging:
     host: servicex.atlas-ml.org
     port: 5959
     protocol: TCP
+    monitor: "https://atlas-kibana.mwt2.org:5601/s/servicex/app/dashboards?auth_provider_hint=anonymous1#/view/c2cc1f30-4a5b-11ed-afcf-d91dad577662?embed=true&_g=(filters%3A!()%2CrefreshInterval%3A(pause%3A!t%2Cvalue%3A0)%2Ctime%3A(from%3Anow-24h%2Fh%2Cto%3Anow))&show-time-filter=true"
+    logs: "https://atlas-kibana.mwt2.org:5601/s/servicex/app/dashboards?auth_provider_hint=anonymous1#/view/bb682100-5558-11ed-afcf-d91dad577662?embed=true&_g=(filters%3A!(('%24state'%3A(store%3AglobalState)%2Cmeta%3A(alias%3A!n%2Cdisabled%3A!f%2Cindex%3A'923eaa00-45b9-11ed-afcf-d91dad577662'%2Ckey%3Ainstance%2Cnegate%3A!f%2Cparams%3A(query%3Aservicex)%2Ctype%3Aphrase)%2Cquery%3A(match_phrase%3A(instance%3A{{ .Release.Name] }}))))%2CrefreshInterval%3A(pause%3A!t%2Cvalue%3A0)%2Ctime%3A(from%3Anow-24h%2Fh%2Cto%3Anow))&show-query-input=true&show-time-filter=true&hide-filter-bar=true"
 minio:
   auth:
     rootPassword: leftfoot1

servicex_app/servicex/templates/logs.html

@@ -1,9 +1,7 @@
 {% extends "base.html" %}
-{% block content %}
 
-<iframe
-    src="https://atlas-kibana.mwt2.org:5601/s/servicex/app/dashboards?auth_provider_hint=anonymous1#/view/bb682100-5558-11ed-afcf-d91dad577662?embed=true&_g=(filters%3A!(('%24state'%3A(store%3AglobalState)%2Cmeta%3A(alias%3A!n%2Cdisabled%3A!f%2Cindex%3A'923eaa00-45b9-11ed-afcf-d91dad577662'%2Ckey%3Ainstance%2Cnegate%3A!f%2Cparams%3A(query%3Aservicex)%2Ctype%3Aphrase)%2Cquery%3A(match_phrase%3A(instance%3A{{ config['INSTANCE_NAME'] }}))))%2CrefreshInterval%3A(pause%3A!t%2Cvalue%3A0)%2Ctime%3A(from%3Anow-24h%2Fh%2Cto%3Anow))&show-query-input=true&show-time-filter=true&hide-filter-bar=true">
-</iframe>
+{% block content %}
+<iframe src="{{ config['LOGS_URL'] }}"> </iframe>
 {% endblock %}
 
 

servicex_app/servicex/templates/monitor.html

@@ -1,10 +1,7 @@
 {% extends "base.html" %}
-{% block content %}
-
-<iframe
-    src="https://atlas-kibana.mwt2.org:5601/s/servicex/app/dashboards?auth_provider_hint=anonymous1#/view/c2cc1f30-4a5b-11ed-afcf-d91dad577662?embed=true&_g=(filters%3A!()%2CrefreshInterval%3A(pause%3A!t%2Cvalue%3A0)%2Ctime%3A(from%3Anow-24h%2Fh%2Cto%3Anow))&show-time-filter=true">
-</iframe>
 
+{% block content %}
+<iframe src="{{ config['MONITOR_URL'] }}"> </iframe>
 {% endblock %}
 
 {% block scripts %}