Resolved merge conflicts

Author: rsarwad

cwf/gateway/go.sum

@@ -74,6 +74,7 @@ github.com/facebookincubator/ent v0.0.0-20191128071424-29c7b0a0d805 h1:Gqrw3IfjW
 github.com/facebookincubator/ent v0.0.0-20191128071424-29c7b0a0d805/go.mod h1:3CGvz1m+D78JUti7JFkY6AkKj88McWuT80UcamLqEJQ=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fiorix/go-diameter/v4 v4.0.1-0.20200102140015-a6c006d17e34/go.mod h1:Qx/+pf+c9sBUHWq1d7EH3bkdwN8U0mUpdy9BieDw6UQ=
+github.com/fiorix/go-diameter/v4 v4.0.1/go.mod h1:Qx/+pf+c9sBUHWq1d7EH3bkdwN8U0mUpdy9BieDw6UQ=
 github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/getsentry/raven-go v0.1.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ=

docs/readmes/orc8r/deploy_build.md

@@ -22,7 +22,7 @@ When this job finishes, upload these images to your image registry:
 
 ```bash
 export MAGMA_TAG=v1.0.0
-for image in proxy controller prometheus-cache config-manager grafana
+for image in proxy controller prometheus-cache alertmanager-configurer prometheus-configurer grafana
 do
     ../../../orc8r/tools/docker/publish.sh -r REGISTRY -i ${image} -v ${MAGMA_TAG}
 done

docs/readmes/orc8r/deploy_install.md

@@ -172,8 +172,8 @@ prometheusPushAddresses:
   - "http://orc8r-prometheus-cache:9091/metrics"
 
 alertmanagerApiURL: "http://orc8r-alertmanager:9093/api/v2/alerts"
-prometheusConfigServiceURL: "http://orc8r-config-manager:9100"
-alertmanagerConfigServiceURL: "http://orc8r-config-manager:9101"
+prometheusConfigServiceURL: "http://orc8r-prometheus-configurer:9100"
+alertmanagerConfigServiceURL: "http://orc8r-alertmanager-configurer:9101"
 ```
 
 ## Initial Helm Deploy
@@ -265,10 +265,18 @@ metrics:
     nodeSelector:
       worker-type: metrics
 
-  configmanager:
+  alertmanagerConfigurer:
     create: true
     image:
-      repository: YOUR-DOCKER-REGISTRY/config-manager
+      repository: YOUR-DOCKER-REGISTRY/alertmanager-configurer
+      tag: YOUR-CONTAINER-TAG
+    nodeSelector:
+      worker-type: metrics
+      
+  prometheusConfigurer:
+    create: true
+    image:
+      repository: YOUR-DOCKER-REGISTRY/prometheus-configurer
       tag: YOUR-CONTAINER-TAG
     nodeSelector:
       worker-type: metrics
@@ -350,16 +358,17 @@ First, find a `orc8r-controller-` pod in k8s:
 ```bash
 $ kubectl -n magma get pods
 
-NAME                                      READY   STATUS    RESTARTS   AGE
-orc8r-configmanager-896d784bc-chqr7       1/1     Running   0          X
-orc8r-controller-7757567bf5-cm4wn         1/1     Running   0          X
-orc8r-controller-7757567bf5-jshpv         1/1     Running   0          X
-orc8r-alertmanager-c8dc7cdb5-crzpl        1/1     Running   0          X
-orc8r-grafana-6446b97885-ck6g8            1/1     Running   0          X
-orc8r-prometheus-6c67bcc9d8-6lx22         1/1     Running   0          X
-orc8r-prometheus-cache-6bf7648446-9t9hx   1/1     Running   0          X
-orc8r-proxy-57cf989fcc-cg54z              1/1     Running   0          X
-orc8r-proxy-57cf989fcc-xn2cw              1/1     Running   0          X
+NAME                                              READY   STATUS    RESTARTS   AGE
+orc8r-alertmanager-configurer-c8dc7cdb5-crzpl     1/1     Running   0          X
+orc8r-controller-7757567bf5-cm4wn                 1/1     Running   0          X
+orc8r-controller-7757567bf5-jshpv                 1/1     Running   0          X
+orc8r-alertmanager-c8dc7cdb5-crzpl                1/1     Running   0          X
+orc8r-grafana-6446b97885-ck6g8                    1/1     Running   0          X
+orc8r-prometheus-6c67bcc9d8-6lx22                 1/1     Running   0          X
+orc8r-prometheus-cache-6bf7648446-9t9hx           1/1     Running   0          X
+orc8r-prometheus-configurer-896d784bc-chqr7       1/1     Running   0          X
+orc8r-proxy-57cf989fcc-cg54z                      1/1     Running   0          X
+orc8r-proxy-57cf989fcc-xn2cw                      1/1     Running   0          X
 ```
 
 Then:

feg/gateway/go.mod

@@ -7,6 +7,8 @@
 module magma/feg/gateway
 
 replace (
+	github.com/fiorix/go-diameter/v4 => github.com/emakeev/go-diameter/v4 v4.0.2
+
 	magma/feg/cloud/go => ../../feg/cloud/go
 	magma/feg/cloud/go/protos => ../../feg/cloud/go/protos
 
@@ -16,7 +18,7 @@ replace (
 )
 
 require (
-	github.com/fiorix/go-diameter/v4 v4.0.1-0.20200102140015-a6c006d17e34
+	github.com/fiorix/go-diameter/v4 v4.0.1
 	github.com/go-redis/redis v6.14.1+incompatible
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
 	github.com/golang/protobuf v1.3.2