diff --git a/app/code/Magento/NewRelicReporting/Console/Command/DeployMarker.php b/app/code/Magento/NewRelicReporting/Console/Command/DeployMarker.php
new file mode 100644
index 0000000000000..9b19cc957ae70
--- /dev/null
+++ b/app/code/Magento/NewRelicReporting/Console/Command/DeployMarker.php
@@ -0,0 +1,81 @@
+deploymentsFactory = $deploymentsFactory;
+ $this->serviceShellUser = $serviceShellUser;
+ parent::__construct($name);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function configure()
+ {
+ $this->setName("newrelic:create:deploy-marker");
+ $this->setDescription("Check the deploy queue for entries and create an appropriate deploy marker.")
+ ->addArgument(
+ 'message',
+ InputArgument::REQUIRED,
+ 'Deploy Message?'
+ )
+ ->addArgument(
+ 'changelog',
+ InputArgument::REQUIRED,
+ 'Change Log?'
+ )
+ ->addArgument(
+ 'user',
+ InputArgument::OPTIONAL,
+ 'Deployment User'
+ );
+ parent::configure();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function execute(InputInterface $input, OutputInterface $output)
+ {
+ $this->deploymentsFactory->create()->setDeployment(
+ $input->getArgument('message'),
+ $input->getArgument('changelog'),
+ $this->serviceShellUser->get($input->getArgument('user'))
+ );
+ $output->writeln('NewRelic deployment information sent');
+ }
+}
diff --git a/app/code/Magento/NewRelicReporting/Model/Cron/ReportNewRelicCron.php b/app/code/Magento/NewRelicReporting/Model/Cron/ReportNewRelicCron.php
index a4a7d30b44f5b..6b2bd50dc456b 100644
--- a/app/code/Magento/NewRelicReporting/Model/Cron/ReportNewRelicCron.php
+++ b/app/code/Magento/NewRelicReporting/Model/Cron/ReportNewRelicCron.php
@@ -175,7 +175,6 @@ protected function reportCounts()
public function report()
{
if ($this->config->isNewRelicEnabled()) {
- $this->reportModules();
$this->reportCounts();
}
diff --git a/app/code/Magento/NewRelicReporting/Model/ServiceShellUser.php b/app/code/Magento/NewRelicReporting/Model/ServiceShellUser.php
new file mode 100644
index 0000000000000..c038be4fb2a76
--- /dev/null
+++ b/app/code/Magento/NewRelicReporting/Model/ServiceShellUser.php
@@ -0,0 +1,34 @@
+ [
- ['name' => 'name', 'setup_version' => '2.0.0', 'type' => 'enabled'],
- ['name' => 'name', 'setup_version' => '2.0.0', 'type' => 'disabled'],
- ['name' => 'name', 'setup_version' => '2.0.0', 'type' => 'installed'],
- ['name' => 'name', 'setup_version' => '2.0.0', 'type' => 'uninstalled'],
- ],
- 'enabled' => 1,
- 'disabled' => 1,
- 'installed' => 1,
- ];
$this->config->expects($this->once())
->method('isNewRelicEnabled')
->willReturn(true);
- $this->collect->expects($this->once())
- ->method('getModuleData')
- ->willReturn($testModuleData);
$this->counter->expects($this->once())
->method('getAllProductsCount');
$this->counter->expects($this->once())
@@ -198,24 +184,10 @@ public function testReportNewRelicCron()
*/
public function testReportNewRelicCronRequestFailed()
{
- $testModuleData = [
- 'changes' => [
- ['name' => 'name', 'setup_version' => '2.0.0', 'type' => 'enabled'],
- ['name' => 'name', 'setup_version' => '2.0.0', 'type' => 'disabled'],
- ['name' => 'name', 'setup_version' => '2.0.0', 'type' => 'installed'],
- ['name' => 'name', 'setup_version' => '2.0.0', 'type' => 'uninstalled'],
- ],
- 'enabled' => 1,
- 'disabled' => 1,
- 'installed' => 1,
- ];
$this->config->expects($this->once())
->method('isNewRelicEnabled')
->willReturn(true);
- $this->collect->expects($this->once())
- ->method('getModuleData')
- ->willReturn($testModuleData);
$this->counter->expects($this->once())
->method('getAllProductsCount');
$this->counter->expects($this->once())
diff --git a/app/code/Magento/NewRelicReporting/etc/di.xml b/app/code/Magento/NewRelicReporting/etc/di.xml
index cba92f91cd4bb..2dccc45c1129b 100644
--- a/app/code/Magento/NewRelicReporting/etc/di.xml
+++ b/app/code/Magento/NewRelicReporting/etc/di.xml
@@ -30,4 +30,11 @@
+
+
+
+ - Magento\NewRelicReporting\Console\Command\DeployMarker
+
+
+