Slapos master monitoring url update

See merge request !579

master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/Base_getStatusMonitorUrl.py

-base_url = 'https://monitor.app.officejs.com/#/?page=ojsm_dispatch&query=portal_type:"Software Instance" AND '
+# TODO how to avoid hardcode here? from InstanceTree_getConnectionParameterList?
+base_url = 'https://monitor.app.officejs.com/#/?page=ojsm_landing'
 
 if context.getPortalType() == "Instance Tree":
   for connection_parameter in context.InstanceTree_getConnectionParameterList(raw=True):
     if connection_parameter['connection_key'] == "monitor-setup-url":
       return connection_parameter['connection_value']
-  base_url = 'https://monitor.app.officejs.com/#/?page=ojsm_dispatch&query=portal_type:"Instance Tree" AND '
-  return base_url + "title:(%s)" % context.getTitle()
+  connection_parameter_dict = context.InstanceTree_getMonitorParameterDict()
+  connection_url = '&url=%s'% connection_parameter_dict['url'] + '&username=%s'% connection_parameter_dict['username'] + '&password=%s'% connection_parameter_dict['password']
+  return base_url + '&query=portal_type:"Instance Tree" AND title:(%s)' % context.getTitle() + connection_url
 
 if context.getPortalType() in ["Software Instance", "Slave Instance"]:
-  return base_url + "reference:%s" % context.getReference()
+  instance_tree = context.getSpecialise()
+  connection_parameter_dict = instance_tree.InstanceTree_getMonitorParameterDict()
+  connection_url = '&url=%s'% connection_parameter_dict['url'] + '&username=%s'% connection_parameter_dict['username'] + '&password=%s'% connection_parameter_dict['password']
+  return base_url + '&query=portal_type:"Software Instance" AND title:"%s" AND ' % context.getTitle() + 'specialise_title:"%s"' % context.getSpecialiseTitle() + connection_url