Added es index names in configfile + code to adopt name from file

server/script/mapconfig.yml

@@ -10,6 +10,7 @@ dragonlab:
     # Event types for variant
     gapsum:
       title: "Gap summary"
+      index: "dragonlab" 
       default_field: "down_ppm"   # Data field to select as default
       # Relevant data fields for event type (matches ES field names)
       field:
@@ -55,6 +56,7 @@ dragonlab:
           aggr: "sum"
     gap:
       title: "Gaps"
+      index: "dragonlab" 
       field:
         down_ppm:
           title: "Unavailability"
@@ -89,6 +91,7 @@ dragonlab:
       default_field: "down_ppm"
     jitter:
       title: "Queues"
+      index: "dragonlab_jitter" 
       default_field: "h_ddelay"
       field:
         h_ddelay:
@@ -113,6 +116,7 @@ dragonlab:
           aggr: "avg"
     routesum:
       title: "Route summary"
+      index: "dragonlab_routemon" 
       default_field: "routes_failed"
       field:
         routes_failed:
@@ -154,6 +158,7 @@ dragonlab:
           aggr: "max"
     routeerr:
       title: "Route errors"
+      index: "dragonlab_routemon" 
       default_field: "anomaly_count"
       field:
         anomaly_count:
@@ -192,6 +197,7 @@ dragonlab:
           aggr: ""
     routechange:
       title: "Route changes"
+      index: "dragonlab_routemon" 
       default_field: "no_hops_over_ce_limit"
       field:
         anomality_class:
@@ -244,6 +250,7 @@ uninett:
     # Event types for variant
     gapsum:
       title: "Gap summary"
+      index: "uninett"
       default_field: "down_ppm"   # Data field to select as default
       # Relevant data fields for event type (matches ES field names)
       field:
@@ -289,6 +296,7 @@ uninett:
           aggr: "sum"
     gap:
       title: "Gaps"
+      index: "uninett"
       field:
         down_ppm:
           title: "Unavailability"
@@ -323,6 +331,7 @@ uninett:
       default_field: "down_ppm"
     jitter:
       title: "Queues"
+      index: "uninett_jitter"
       default_field: "h_ddelay"
       field:
         h_ddelay:

server/script/microdep-map.html

@@ -210,6 +210,7 @@ var no_coords= new LatLon(70.98584, -8.49243); // Jan Mayen
 var points=[];
 
 var empty_color="LightGray";
+  var event_index = {} 
 var prop_names_list = {
       gapsum: "down_ppm h_ddelay h_jit h_min_d big_gaps big_time small_gaps small_time".split(" "),
       gap: "down_ppm tloss h_ddelay h_jit h_min_d h_slope_10".split(" "),
@@ -260,9 +261,11 @@ var points_cache=[];
 	  prop_names_list ={}; 
 	  prop_desc ={}; 
 	  event_desc={};
+	  event_index={};
 	  for (const e in conffile[parms.net].event_type) {
 	      prop_names_list[e]=[];
 	      event_desc[e] = conffile[parms.net].event_type[e].title
+	      event_index[e] = conffile[parms.net].event_type[e].index
 	      for (const f in conffile[parms.net].event_type[e].field) {
 		  // Add only numeric properties/variables
 		  if (conffile[parms.net].event_type[e].field[f].type == "number") {
@@ -1765,6 +1768,10 @@ function get_connections(){
     //links=[];
     var index=parms.net; 
     var etype= $("#event_type").val();
+    if ( ! jQuery.isEmptyObject(event_index)) {
+	// Apply ES indexname from config file
+	index = event_index[parms.event];
+    } else
     if ( etype === "gap" || etype === "gapsum" )
 	;
     else if ( etype === "routeerr" || etype === "routesum" )