diff --git a/createDash.py b/createDash.py index fdc8e2a..28afc88 100644 --- a/createDash.py +++ b/createDash.py @@ -184,7 +184,7 @@ def get_DataExplorerTile_SingleValue(customName, metricSelector, remoteEnvironme "bounds": bounds, "tileFilter": { "timeframe": timeframe }, "remoteEnvironmentUri": remoteEnvironmentUrl, - "customName": customName, + "customName": metricSelector, "queries": [ { "id": "A", @@ -199,7 +199,7 @@ def get_DataExplorerTile_SingleValue(customName, metricSelector, remoteEnvironme "visualConfig": { "type": "SINGLE_VALUE", "global": { "seriesType": "LINE", "hideLegend": "true" }, - "rules": [ { "matcher": "A:", "properties": { "color": "DEFAULT", "seriesType": "LINE", "alias": "SLO" }, "seriesOverrides": [{"name": customName, "color": "#ffffff"}] } ], + "rules": [ { "matcher": "A:", "properties": { "color": "DEFAULT", "seriesType": "LINE", "alias": "SLO" }, "seriesOverrides": [{"name": metricSelector, "color": "#ffffff"}] } ], "axes": { "xAxis": { "visible": "true" }, "yAxes": [] }, "heatmapSettings": {}, "singleValueSettings": { "showTrend": "false", "showSparkLine": "false", "linkTileColorToThreshold": "true" }, @@ -219,7 +219,7 @@ def get_DataExplorerTile_Graph(customName, metricSelector, remoteEnvironmentUrl, "bounds": bounds, "tileFilter": { "timeframe": timeframe }, "remoteEnvironmentUri": remoteEnvironmentUrl, - "customName": customName, + "customName": metricSelector, "queries": [ { "id": "A", @@ -234,7 +234,7 @@ def get_DataExplorerTile_Graph(customName, metricSelector, remoteEnvironmentUrl, "visualConfig": { "type": "GRAPH_CHART", "global": { "seriesType": "LINE", "hideLegend": "true" }, - "rules": [ { "matcher": "A:", "properties": { "color": "DEFAULT", "seriesType": "LINE", "alias": "SLO" }, "seriesOverrides": [{"name": customName, "color": "#ffffff"}] } ], + "rules": [ { "matcher": "A:", "properties": { "color": "DEFAULT", "seriesType": "LINE", "alias": "SLO" }, "seriesOverrides": [{"name": metricSelector, "color": "#ffffff"}] } ], "axes": { "xAxis": { "visible": "true" }, "yAxes": [{ "displayName": "", "visible": "true", "min": axisTargetMin, "max": axisTargetMax, "position": "LEFT", "queryIds": [ "A" ], "defaultAxis": "true" }] }, "heatmapSettings": {}, "singleValueSettings": { "showTrend": "false", "showSparkLine": "false", "linkTileColorToThreshold": "true" }, @@ -314,8 +314,6 @@ def main(slo_path): if(args.rows is not None): rowcount = args.rows for slo_name, configuration in slo_doc.items(): - if "TP_" + args.touchpoint in slo_name: - print (slo_name + " eq " + args.touchpoint) if "TP_" + args.touchpoint in slo_name: slo_index = configuration["index"] currindex = slo_index