update query and parsing for ES cluster split

Stephan Lammel · Stephan Lammel · commit 6f223f87bc2c · 2020-08-10T16:11:22.000-05:00
diff --git a/capacity/capacity_admin.py b/capacity/capacity_admin.py
@@ -274,7 +274,7 @@ def capa_startd_usage():
     # ##################################################### #
     # return dictionary of max cores used during last month #
     # ##################################################### #
-    URL_GRAFANA = "https://monit-grafana.cern.ch/api/datasources/proxy/8787/_msearch?filter_path=responses.aggregations.cpus_per_site.buckets.key,responses.aggregations.cpus_per_site.buckets.max_cpus_a.value,responses.aggregations.cpus_per_site.buckets.max_cpus_b.value"
+    URL_GRAFANA = "https://monit-grafana.cern.ch/api/datasources/proxy/9668/_msearch?filter_path=responses.aggregations.cpus_per_site.buckets.key,responses.aggregations.cpus_per_site.buckets.max_cpus_a.value,responses.aggregations.cpus_per_site.buckets.max_cpus_b.value"
     HDR_GRAFANA = {'Authorization': "Bearer eyJrIjoiZWRnWXc1bUZWS0kwbWExN011TGNTN2I2S1JpZFFtTWYiLCJuIjoiY21zLXNzYiIsImlkIjoxMX0=", 'Content-Type': "application/json; charset=UTF-8"}
     #
     siteRegex = re.compile(r"T\d_[A-Z]{2,2}_\w+")

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ def capa_startd_usage():`
`274`	`274`	`# ##################################################### #`
`275`	`275`	`# return dictionary of max cores used during last month #`
`276`	`276`	`# ##################################################### #`
`277`		`- URL_GRAFANA = "https://monit-grafana.cern.ch/api/datasources/proxy/8787/_msearch?filter_path=responses.aggregations.cpus_per_site.buckets.key,responses.aggregations.cpus_per_site.buckets.max_cpus_a.value,responses.aggregations.cpus_per_site.buckets.max_cpus_b.value"`
	`277`	`+ URL_GRAFANA = "https://monit-grafana.cern.ch/api/datasources/proxy/9668/_msearch?filter_path=responses.aggregations.cpus_per_site.buckets.key,responses.aggregations.cpus_per_site.buckets.max_cpus_a.value,responses.aggregations.cpus_per_site.buckets.max_cpus_b.value"`
`278`	`278`	`HDR_GRAFANA = {'Authorization': "Bearer eyJrIjoiZWRnWXc1bUZWS0kwbWExN011TGNTN2I2S1JpZFFtTWYiLCJuIjoiY21zLXNzYiIsImlkIjoxMX0=", 'Content-Type': "application/json; charset=UTF-8"}`
`279`	`279`	`#`
`280`	`280`	`siteRegex = re.compile(r"T\d_[A-Z]{2,2}_\w+")`