| commit | dfc59f313dcb364780c201e8c8ca10aa4a7d10c1 | [log] [tgz] |
|---|---|---|
| author | Antonio Barone <syntonyze@gmail.com> | Wed Nov 21 15:05:35 2018 +0000 |
| committer | Antonio Barone <syntonyze@gmail.com> | Wed Nov 21 15:05:35 2018 +0000 |
| tree | ee5313bc3ce425631930353e35a7c01ff310e7e6 | |
| parent | c1e1fcb6f1dae5af91e8a060c20e9e555ca9fa50 [diff] |
Point docker-compose to new gitcommits ETL image The spark job dealing with git commits has changed name from: spark-gerrit-analytics-etl to: gerrit-analytics-etl-gitcommits Feature: Issue 10074 Change-Id: Ie6d4a186fc20f4c1650ca216b4df686b8a4e0549
diff --git a/src/main/scala/com/googlesource/gerrit/plugins/analytics/wizard/AnalyticDashboardSetup.scala b/src/main/scala/com/googlesource/gerrit/plugins/analytics/wizard/AnalyticDashboardSetup.scala index 13b1120..fd038be 100644 --- a/src/main/scala/com/googlesource/gerrit/plugins/analytics/wizard/AnalyticDashboardSetup.scala +++ b/src/main/scala/com/googlesource/gerrit/plugins/analytics/wizard/AnalyticDashboardSetup.scala
@@ -56,10 +56,11 @@ |version: '3' |services: | - | spark-gerrit-analytics-etl: + | gerrit-analytics-etl-gitcommits: | extra_hosts: | - gerrit:${gerritLocalUrl.getHost} - | image: gerritforge/spark-gerrit-analytics-etl:latest + | image: gerritforge/gerrit-analytics-etl-gitcommits:latest + | container_name: gerrit-analytics-etl-gitcommits | environment: | - ES_HOST=elasticsearch | - GERRIT_URL=${gerritLocalUrl.getProtocol}://gerrit:${gerritLocalUrl.getPort}
diff --git a/src/main/scala/com/googlesource/gerrit/plugins/analytics/wizard/AnalyticsWizardActions.scala b/src/main/scala/com/googlesource/gerrit/plugins/analytics/wizard/AnalyticsWizardActions.scala index a364bb3..e545925 100644 --- a/src/main/scala/com/googlesource/gerrit/plugins/analytics/wizard/AnalyticsWizardActions.scala +++ b/src/main/scala/com/googlesource/gerrit/plugins/analytics/wizard/AnalyticsWizardActions.scala
@@ -101,7 +101,7 @@ val dockerClientProvider: DockerClientProvider) extends RestReadView[ProjectResource] { override def apply(resource: ProjectResource): Response[String] = { - val containerName = "analytics-wizard_spark-gerrit-analytics-etl_1" + val containerName = "gerrit-analytics-etl-gitcommits" responseFromContainerInfo(dockerClientProvider.client.inspectContainer(containerName)) } private def responseFromContainerInfo(containerInfo: ContainerInfo) = {