From c1c4d90b8584efffe0523f02826035a4fd0d5e4a Mon Sep 17 00:00:00 2001
From: kristinaspring <kmspring57@gmail.com>
Date: Mon, 27 Jul 2020 19:53:53 -0700
Subject: [PATCH] changed docker-compose to have yb-manager (#115)

---
 CHANGELOG.md                                  |  1 +
 deploy/docker-compose/docFiles/prometheus.yml |  4 ++--
 deploy/docker-compose/docker-compose.yml      | 12 ++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b417d3..0e206a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 - Updated references to the main branch [#113](https://github.com/xmidt-org/codex-deploy/pull/113)
+- Updated references to yb-manager in docker-compose [#114](https://github.com/xmidt-org/codex-deploy/pull/114)
 
 ## [v0.11.0]
 - Separated out library packages, so only deploy and tests are left.
diff --git a/deploy/docker-compose/docFiles/prometheus.yml b/deploy/docker-compose/docFiles/prometheus.yml
index 4cf21c6..a47a14a 100644
--- a/deploy/docker-compose/docFiles/prometheus.yml
+++ b/deploy/docker-compose/docFiles/prometheus.yml
@@ -61,9 +61,9 @@ scrape_configs:
         target_label: __name__
         replacement: "yugabyte_${1}"
     static_configs:
-      - targets: ['yb-master-n1:7000']
+      - targets: ['yb-manager-n1:7000']
         labels:
-          group: 'yb-master'
+          group: 'yb-manager'
 
       - targets: ['yb-tserver-n1:9000']
         labels:
diff --git a/deploy/docker-compose/docker-compose.yml b/deploy/docker-compose/docker-compose.yml
index c83d58b..7a39799 100644
--- a/deploy/docker-compose/docker-compose.yml
+++ b/deploy/docker-compose/docker-compose.yml
@@ -35,19 +35,19 @@ services:
     depends_on:
       - yb-tserver
 
-  yb-master:
+  yb-manager:
       image: yugabytedb/yugabyte:latest
-      container_name: yb-master-n1
+      container_name: yb-manager-n1
       command: [ "/home/yugabyte/bin/yb-master",
                 "--fs_data_dirs=/mnt/disk0,/mnt/disk1",
-                "--master_addresses=yb-master-n1:7100",
+                "--master_addresses=yb-manager-n1:7100",
                 "--replication_factor=1"]
       networks:
         - back-tier
       ports:
       - "7111:7000"
       environment:
-        SERVICE_7000_NAME: yb-master
+        SERVICE_7000_NAME: yb-manager
 
   yb-tserver:
       image: yugabytedb/yugabyte:latest
@@ -56,7 +56,7 @@ services:
         - ./docFiles/create_db.cql:/create_db.cql
       command: [ "/home/yugabyte/bin/yb-tserver",
                 "--fs_data_dirs=/mnt/disk0,/mnt/disk1",
-                "--tserver_master_addrs=yb-master-n1:7100"]
+                "--tserver_master_addrs=yb-manager-n1:7100"]
       networks:
         - back-tier
       ports:
@@ -70,7 +70,7 @@ services:
         SERVICE_6379_NAME: yedis
         SERVICE_9000_NAME: yb-tserver
       depends_on:
-      - yb-master
+      - yb-manager
 
   prometheus:
     image: prom/prometheus