Feature/original 123 hostname agent matrix (#126)

* add hostId to agent matrix-machine agent report, addresses #123 * fix ppt stat error. see bug #99
Appdynamics · Sep 12, 2023 · ddb28b2 · ddb28b2
1 parent ef56018
commit ddb28b2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v1.5.9.8
+v1.5.9.9
diff --git a/backend/output/presentations/cxPpt.py b/backend/output/presentations/cxPpt.py
@@ -326,7 +326,7 @@ def createCxPpt(folder: str):
             folder,
             str(
                 format(
-                    (len([x for x in successPercentageOfWorstTransaction if x == 100]) / totalApplications if totalApplications > 0 else 0) * 100,
+                    (len([x for x in successPercentageOfWorstTransaction if x == 0]) / totalApplications if totalApplications > 0 else 0) * 100,
                     ".0f",
                 )
             )

diff --git a/backend/output/reports/AgentMatrixReport.py b/backend/output/reports/AgentMatrixReport.py
@@ -103,6 +103,7 @@ def createWorkbook(self, jobs, controllerData, jobFileName):
 
             machineAgentCols.extend(
                 [
+                    "hostId",
                     "simEnabled",
                     "historical",
                     "reportingData",
@@ -152,6 +153,12 @@ def createWorkbook(self, jobs, controllerData, jobFileName):
                         if agent["hostName"] in hostInfo["servers"]:
                             server = hostInfo["servers"][agent["hostName"]]
 
+                            # Windows hostName is different than hostId by default, make consistent with how it shows on UI
+                            if server["name"] != server["hostId"]:
+                                data[cols.index("hostName")] = server["name"]
+
+                            data.append(server["hostId"] if "hostId" in server else "")
+
                             # use id shown in UI
                             data[cols.index("machineId")] = server["id"]
 
@@ -171,6 +178,8 @@ def createWorkbook(self, jobs, controllerData, jobFileName):
 
                             data.append(json.dumps(server["tags"]) if "tags" in server else "")
                         else:
+                            # hostId
+                            data.append(None)
                             # simEnabled
                             data.append(False)
                             # historical

diff --git a/input/thresholds/DefaultThresholds.json b/input/thresholds/DefaultThresholds.json
@@ -1,5 +1,5 @@
 {
-	"version": "v1.5.9.8",
+	"version": "v1.5.9.9",
 	"apm": {
 		"AppAgentsAPM": {
 			"platinum": {