Skip to content

Commit

Permalink
Program:
Browse files Browse the repository at this point in the history
- Updated some packages to gain security fixed in dependent libraries

Entity Dashboard Screenshots Report:
- Removed Chrome Driver 83
- Added Chrome Driver 83

Snapshots Report:
- Added RequestID Filtering

Individual Snapshot Report:
- Added this new report

Flame Graphs Report:
- Added HTML page summary for application

APM Entity Metrics Report:
- Removed scatter plot
- Added ability to extract summary period metrics without per-minute/per-hour durations to dramatically shorten the time for just a "overall summary" report (fix #111)
- added new JMX metric metric sets for Web Container Runtime and JDBC Connection Pooling for Tomcat and JBoss Java applications
- Fixed #40

Entity Metrics Report in Tableau:
- Fixed #31
- added new JMX metric metric sets for Web Container Runtime and JDBC Connection Pooling for Tomcat and JBoss Java applications for Tiers and Nodes

Detected Entities Report:
- Added Cloud host and region
- Added JVM min and max heap size
- Added runtime properties and versions
  • Loading branch information
danielodievich committed Jul 2, 2020
1 parent 07eebaa commit 1c0a323
Show file tree
Hide file tree
Showing 72 changed files with 33,823 additions and 32,271 deletions.
21 changes: 17 additions & 4 deletions AppDynamics.Dexter.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,18 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Aspose.Words" Version="20.5.0" />
<PackageReference Include="Aspose.Words" Version="20.6.0" />
<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="CsvHelper" Version="7.1.1" />
<PackageReference Include="EPPlus" Version="4.5.3.3" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NLog" Version="4.7.1" />
<PackageReference Include="NLog.Config" Version="4.7.1" />
<PackageReference Include="NLog.Schema" Version="4.7.1" />
<PackageReference Include="NLog" Version="4.7.2" />
<PackageReference Include="NLog.Config" Version="4.7.2" />
<PackageReference Include="NLog.Schema" Version="4.7.2" />
<PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="5.8.64" />
<PackageReference Include="Selenium.Support" Version="3.141.0" />
<PackageReference Include="Selenium.WebDriver" Version="3.141.0" />
<PackageReference Include="SkiaSharp" Version="1.68.3" />
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
</ItemGroup>
Expand Down Expand Up @@ -100,6 +101,15 @@
<None Update="ChromeDriver\81\win32\chromedriver.exe">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="ChromeDriver\83\linux64\chromedriver">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="ChromeDriver\83\mac64\chromedriver">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="ChromeDriver\83\win32\chromedriver.exe">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="EmptyConfig\reference.controller\EmptyAPM.0\CFG\seps.detection.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand All @@ -112,6 +122,9 @@
<None Update="License\AppDynamics.DEXTER.public.cer">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="LinksToApplicationFlameGraphsTemplate.html">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="LinksToApplicationsDashboardsTemplate.html">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
5,287 changes: 1,081 additions & 4,206 deletions CodeMap.dgml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion DataObjects/JobConfiguration/JobInput.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class JobInput
public bool DetectedEntities { get; set; }
public bool Flowmaps { get; set; }
public bool Metrics { get; set; }
public string[] MetricsSelectionCriteria { get; set; }
public JobMetricSelectionCriteria MetricsSelectionCriteria { get; set; }
public bool Snapshots { get; set; }
public bool Configuration { get; set; }
public JobTarget ConfigurationComparisonReferenceAPM { get; set; }
Expand Down
8 changes: 8 additions & 0 deletions DataObjects/JobConfiguration/JobMetricSelectionCriteria.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace AppDynamics.Dexter
{
public class JobMetricSelectionCriteria
{
public string[] MetricSets { get; set; }
public bool IncludeHourAndMinuteDetail { get; set; }
}
}
1 change: 1 addition & 0 deletions DataObjects/JobConfiguration/JobOutput.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ public class JobOutput
public bool EntityDetails { get; set; }
public bool EntityDashboards { get; set; }
public bool Snapshots { get; set; }
public bool IndividualSnapshots { get; set; }
public bool Flowmaps { get; set; }
public bool FlameGraphs { get; set; }
public bool Configuration { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ public class JobSnapshotSelectionCriteria
public string[] TierTypes { get; set; }
public string[] BusinessTransactions { get; set; }
public string[] BusinessTransactionTypes { get; set; }
public string[] RequestIDs { get; set; }
public JobUserExperience UserExperience { get; set; }
public JobSnapshotType SnapshotType { get; set; }
}
Expand Down
4 changes: 3 additions & 1 deletion DataObjects/JobConfiguration/JobStatus.cs
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,15 @@ public enum JobStatus
ReportAPMSnapshotsMethodCallLines = 131,
ReportAPMFlameGraphs = 132,

ReportAPMEntityDetails = 133,
ReportAPMEntityDetails = 135,

ReportHealthCheck = 140,
ReportAPMApplicationSummary = 141,

ReportAPMEntityDashboardScreenshots = 150,

ReportAPMIndividualSnapshots = 160,

// The rest
Done = 500,

Expand Down
25 changes: 19 additions & 6 deletions DataObjects/ProgramOptions/ProgramOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,19 @@ namespace AppDynamics.Dexter
public class ProgramOptions
{
// ETL
[Option('j', "job-file", Required = true, SetName = "etl", HelpText = "Input file defining the parameters of the ETL job to process.")]
[Option('j', "job-file", Required = true, SetName = "etl", HelpText = "Input file defining the parameters of the ETL job to process.\nDefines the name of the folder for the report, unless explicit job name is passed.")]
public string InputETLJobFilePath { get; set; }

[Option('n', "job-name", Required = false, SetName = "etl", HelpText = "Job name to use instead of automatically defined based on --job-file parameter.")]
[Option('n', "job-name", Required = false, SetName = "etl", HelpText = "Job name to use instead of being automatically defined based on the name of the job file.")]
public string JobName { get; set; }

// Individual Snapshots
[Option('i', "request-ids", Required = true, SetName = "individualsnapshots", HelpText = "Comma-separated list of Snapshot RequestIDs to process for Individual Snapshots list.")]
public string RequestIDs { get; set; }

[Option('r', "report-folder", Required = true, SetName = "individualsnapshots", HelpText = "Report folder where to look for list of list of Snapshots.")]
public string ReportFolderPath { get; set; }

// Compare States
//[Option('c', "compare-states-file", Required = true, SetName = "compare", HelpText = "Compare file defining the mappings of the state comparison to perform.")]
public string InputCompareJobFilePath { get; set; }
Expand All @@ -23,7 +30,7 @@ public class ProgramOptions
public string CompareReportDifferenceFolderPath { get; set; }

// Common
[Option('o', "output-folder", Required = false, HelpText = "Output folder where to store results of processing.")]
[Option('o', "output-folder", Required = false, HelpText = "Output folder where to store results of processing.\nDefaults to C:\\AppD.Dexter.Out on Windows and %HOME% on Mac/Linux.")]
public string OutputFolderPath { get; set; }

[Option('d', "delete-previous-job-output", Required = false, HelpText = "If true, delete any results of previous processing.")]
Expand All @@ -45,6 +52,8 @@ public class ProgramOptions

public JobOutput LicensedReports { get; set; }

public string IndividualSnapshotsNonDefaultReportFolderName { get; set; }

public override string ToString()
{
return String.Format(
Expand All @@ -60,8 +69,10 @@ public override string ToString()
CompareFilePath='{7}'
ReferenceJobFolderPath='{8}'
DifferenceJobFolderPath='{9}'
SkipVersionCheck='{10}'
",
SkipVersionCheck='{10}',
JobName='{11}',
RequestIDs='{12}',
ReportFolderPath='{13}'",
this.InputETLJobFilePath,
this.DeletePreviousJobOutput,
this.OutputFolderPath,
Expand All @@ -73,7 +84,9 @@ public override string ToString()
this.CompareReportReferenceFolderPath,
this.CompareReportDifferenceFolderPath,
this.SkipVersionCheck,
this.JobName);
this.JobName,
this.RequestIDs,
this.ReportFolderPath);
}
}
}
7 changes: 6 additions & 1 deletion DefaultJob.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,10 @@
},
"DetectedEntities": true,
"Metrics": true,
"MetricsSelectionCriteria": [ "TransactionApplication", "TransactionTier", "TransactionNode", "TransactionBackend", "TransactionBT", "TransactionSEP", "TransactionError", "TransactionIP", "AgentStats", "OSHardware", "CLRStats", "IISStats", "IISReqCounts", "IISReqPerf", "JVMStats", "BusinessTransactionPercentiles" ],
"MetricsSelectionCriteria": {
"MetricSets": [ "TransactionApplication", "TransactionTier", "TransactionNode", "TransactionBackend", "TransactionBT", "TransactionSEP", "TransactionError", "TransactionIP", "AgentStats", "OSHardware", "CLRStats", "IISStats", "IISReqCounts", "IISReqPerf", "JVMStats", "JMXDBConnStats", "JMXWebContainerStats", "BusinessTransactionPercentiles" ],
"IncludeHourAndMinuteDetail": true
},
"Flowmaps": true,
"EntityDashboards": false,
"EntityDashboardSelectionCriteria": {
Expand All @@ -103,6 +106,7 @@
"TierTypes": [ "All" ],
"BusinessTransactions": [],
"BusinessTransactionTypes": [ "All" ],
"RequestIDs": [],
"UserExperience": {
"Normal": true,
"Slow": true,
Expand Down Expand Up @@ -130,6 +134,7 @@
"EntityDashboards": true,
"EntityDetails": true,
"Snapshots": true,
"IndividualSnapshots": false,
"FlameGraphs": true,
"HealthCheck": false,
"ApplicationSummary": false
Expand Down
Loading

0 comments on commit 1c0a323

Please sign in to comment.