diff --git a/AppDynamics.Dexter.csproj b/AppDynamics.Dexter.csproj
deleted file mode 100644
index 0b750ee..0000000
--- a/AppDynamics.Dexter.csproj
+++ /dev/null
@@ -1,431 +0,0 @@
-
-
-
-
- Debug
- AnyCPU
- {0734F6D8-9E80-495D-A096-25668CB7D66C}
- Exe
- AppDynamics.Dexter
- AppDynamics.Dexter
- v4.7.1
- 512
- true
- false
-
- publish\
- true
- Disk
- false
- Foreground
- 7
- Days
- false
- false
- true
- 0
- 1.0.0.%2a
- false
- true
-
-
- AnyCPU
- true
- full
- false
- bin\Debug\net471\
- DEBUG;TRACE
- prompt
- 4
- false
-
-
- AnyCPU
- pdbonly
- true
- bin\Release\net471\
- TRACE
- prompt
- 4
- false
-
-
- true
-
-
- AppDynamics DEXTER.pfx
-
-
-
- obj_netfx\
-
-
- SearchContract.ico
-
-
-
- packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll
-
-
- packages\CsvHelper.7.1.1\lib\net45\CsvHelper.dll
-
-
- packages\EPPlus.4.5.2.1\lib\net40\EPPlus.dll
-
-
- packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll
-
-
- packages\NLog.4.5.6\lib\net45\NLog.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Always
- Designer
-
-
-
- Always
-
-
-
- Designer
-
-
-
- PreserveNewest
- Designer
-
-
-
- Always
-
-
- Always
-
-
- Always
-
-
- Designer
-
-
- Designer
-
-
-
-
- False
- Microsoft .NET Framework 4.5.2 %28x86 and x64%29
- true
-
-
- False
- .NET Framework 3.5 SP1
- false
-
-
-
-
-
\ No newline at end of file
diff --git a/AppDynamics.Dexter.sln b/AppDynamics.Dexter.sln
index 070c170..3b970d0 100644
--- a/AppDynamics.Dexter.sln
+++ b/AppDynamics.Dexter.sln
@@ -1,25 +1,16 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26730.15
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29728.190
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppDynamics.Dexter", "AppDynamics.Dexter.csproj", "{0734F6D8-9E80-495D-A096-25668CB7D66C}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppDynamics.Dexter.Core", "AppDynamics.Dexter.Core.csproj", "{F2687CC0-8C55-4B74-AE08-7A1D6DDE18E1}"
EndProject
Global
- GlobalSection(Performance) = preSolution
- HasPerformanceSessions = true
- EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {0734F6D8-9E80-495D-A096-25668CB7D66C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0734F6D8-9E80-495D-A096-25668CB7D66C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0734F6D8-9E80-495D-A096-25668CB7D66C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0734F6D8-9E80-495D-A096-25668CB7D66C}.Release|Any CPU.Build.0 = Release|Any CPU
{F2687CC0-8C55-4B74-AE08-7A1D6DDE18E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F2687CC0-8C55-4B74-AE08-7A1D6DDE18E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F2687CC0-8C55-4B74-AE08-7A1D6DDE18E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -31,4 +22,7 @@ Global
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {200EEB73-470E-41D4-8004-318CCF3A0954}
EndGlobalSection
+ GlobalSection(Performance) = preSolution
+ HasPerformanceSessions = true
+ EndGlobalSection
EndGlobal
diff --git a/ControllerApi/ControllerApi.cs b/ControllerApi/ControllerApi.cs
index 9da64ad..d4443f9 100644
--- a/ControllerApi/ControllerApi.cs
+++ b/ControllerApi/ControllerApi.cs
@@ -1923,7 +1923,8 @@ private string apiGET(string restAPIUrl, string acceptHeader, bool useXSRFHeader
logger.Error("{0}/{1} GET as {2} returned {3} ({4})", this.ControllerUrl, restAPIUrl, this.UserName, (int)response.StatusCode, response.ReasonPhrase);
}
- if (response.StatusCode == HttpStatusCode.Unauthorized)
+ if (response.StatusCode == HttpStatusCode.Unauthorized ||
+ response.StatusCode == HttpStatusCode.Forbidden)
{
loggerConsole.Error("{0}/{1} GET as {2} returned {3} ({4})", this.ControllerUrl, restAPIUrl, this.UserName, (int)response.StatusCode, response.ReasonPhrase);
}
@@ -1996,7 +1997,8 @@ private string apiPOST(string restAPIUrl, string acceptHeader, string requestBod
logger.Error("{0}/{1} POST as {2} returned {3} ({4})", this.ControllerUrl, restAPIUrl, this.UserName, (int)response.StatusCode, response.ReasonPhrase);
}
- if (response.StatusCode == HttpStatusCode.Unauthorized)
+ if (response.StatusCode == HttpStatusCode.Unauthorized ||
+ response.StatusCode == HttpStatusCode.Forbidden)
{
loggerConsole.Error("{0}/{1} POST as {2} returned {3} ({4})", this.ControllerUrl, restAPIUrl, this.UserName, (int)response.StatusCode, response.ReasonPhrase);
}
diff --git a/DataObjects/JobConfiguration/JobStatus.cs b/DataObjects/JobConfiguration/JobStatus.cs
index f8952a0..85922f8 100644
--- a/DataObjects/JobConfiguration/JobStatus.cs
+++ b/DataObjects/JobConfiguration/JobStatus.cs
@@ -61,8 +61,9 @@ public enum JobStatus
IndexAPMMetrics = 80,
IndexAPMFlowmaps = 81,
IndexAPMSnapshots = 82,
-
- IndexAPMHealthCheck = 90,
+
+ IndexControllerHealthCheck = 90,
+ IndexAPMHealthCheck = 91,
// Report steps
ReportControllerAndApplicationConfiguration = 100,
diff --git a/DefaultJob.json b/DefaultJob.json
index b4ae939..ebbe63a 100644
--- a/DefaultJob.json
+++ b/DefaultJob.json
@@ -51,8 +51,8 @@
],
"Input": {
"TimeRange": {
- "From": "2019-12-17T09:00:00",
- "To": "2019-12-17T10:00:00"
+ "From": "2020-03-09T09:00:00",
+ "To": "2020-03-09T10:00:00"
},
"UsersGroupsRolesPermissions": true,
"Dashboards": true,
@@ -67,7 +67,7 @@
"Metrics": true,
"MetricsSelectionCriteria": [ "TransactionApplication", "TransactionTier", "TransactionNode", "TransactionBackend", "TransactionBT", "TransactionSEP", "TransactionError", "TransactionIP", "AgentStats", "OSHardware", "CLRStats", "IISStats", "IISReqCounts", "IISReqPerf", "JVMStats", "BusinessTransactionPercentiles" ],
"Flowmaps": true,
- "EntityDashboards": true,
+ "EntityDashboards": false,
"EntityDashboardSelectionCriteria": {
"Tiers": [],
"TierType": {
diff --git a/FlameGraphTemplate.svg b/FlameGraphTemplate.svg
index 7f8f4ae..4b0f827 100644
--- a/FlameGraphTemplate.svg
+++ b/FlameGraphTemplate.svg
@@ -12,10 +12,12 @@
xrect[rx]:hover { stroke:#7f17ff; stroke-width:4; }
xtext:hover { font-weight:bold; }
-