syntax fix

Author: gettek

..env

@@ -2,7 +2,7 @@
 TAG=6.4.1
 ELASTIC_VERSION=6.4.1
 ELASTIC_HOST_NAME=elksvr0
-ELASTIC_HOST_IP=10.243.48.7
-ELASTIC_CLUSTER=10.243.48.7,10.243.50.11,10.243.50.7
+ELASTIC_HOST_IP=10.20.40.7
+ELASTIC_CLUSTER=10.20.40.7,10.20.30.11,10.20.30.7
 ELASTIC_PASSWORD=CHANGEME
 ELASTIC_CONFIG_DIR=/usr/share/elasticsearch/config

config/beats/CrushFTP-Filbeat.yml

@@ -1,7 +1,7 @@
 filebeat::beat_name: 'CrushFTP'
 filebeat::outputs:
   logstash:
-    hosts: ['10.243.50.24:5000'] #AZURE-LB
+    hosts: ['10.20.30.24:5000'] #AZURE-LB
     loadbalance: true
 filebeat::logging:
   level: 'info'

config/beats/SMTP-Filebeat.yml

@@ -1,7 +1,7 @@
 filebeat::beat_name: 'smtpbeat'
 filebeat::outputs:
   logstash:
-    hosts: ['10.243.50.24:5000'] #AZURE-LB
+    hosts: ['10.20.30.24:5000'] #AZURE-LB
     loadbalance: true
 filebeat::logging:
   level: 'info'

config/certs/instances.yml

@@ -1,16 +1,16 @@
 instances:
   - name: "monitoringksvr0"
     ip: 
-      - "10.243.48.7"
+      - "10.20.40.7"
     dns: 
       - "monitoringksvr0.dom.co.uk"
   - name: "monitoringesvr0"
     ip:
-      - "10.243.50.11"
+      - "10.20.30.11"
     dns:
       - "monitoringesvr0.dom.co.uk"
   - name: "monitoringesvr1"
     ip:
-      - "10.243.50.7"
+      - "10.20.30.7"
     dns:
       - "monitoringesvr1.dom.co.uk"

config/logstash/logstash.conf

@@ -75,17 +75,17 @@ output {
   stdout { codec => rubydebug }
 	if "smtp-relay" in [tags] {	
 		elasticsearch {
-			hosts => ["10.243.50.29","10.243.50.28","10.243.50.31"]
+			hosts => ["10.20.30.29","10.20.30.28","10.20.30.31"]
 			user => 'elastic'
-			password => 'mLQRt8Uat63f'
+			password => 'changeme'
 			index => "smtp-%{[@metadata][version]}-%{+YYYY.MM.dd}"
 		}
 	}
 	else {
 		elasticsearch {
-			hosts => ["10.243.50.29","10.243.50.28","10.243.50.31"]
+			hosts => ["10.20.30.29","10.20.30.28","10.20.30.31"]
 			user => 'elastic'
-			password => 'mLQRt8Uat63f'			
+			password => 'changeme'			
 			index => "crushftp-%{[@metadata][version]}-%{+YYYY.MM.dd}" #with version
 		}
 	}

config/puppet/monitoring.pp

@@ -25,11 +25,11 @@
   # determine git branch
   if $::environment == 'production' {
     $gitbranch = 'master'
-    $cluster   = '10.243.50.29,10.243.50.28,10.243.50.31'
+    $cluster   = '10.20.30.29,10.20.30.28,10.20.30.31'
   }
   else {
     $gitbranch = 'development'
-    $cluster   = '172.21.248.133,172.21.248.137,172.21.248.139'
+    $cluster   = '172.20.20.133,172.20.20.137,172.20.20.139'
   }
   # create docker environment file
   $nodename = $trusted['hostname']
@@ -137,8 +137,8 @@
   # $elastic_host_ip = $facts['networking']['ip']
   # $elastic_host_name = $trusted['hostname']
   # $elastic_cluster = $trusted['hostname'] ? {
-  # /^dev/  => "172.21.248.133,172.21.248.137,172.21.248.139",
-  # default => "10.243.50.29,10.243.50.28,10.243.50.31",
+  # /^dev/  => "172.20.20.133,172.20.20.137,172.20.20.139",
+  # default => "10.20.30.29,10.20.30.28,10.20.30.31",
   # }
   # 
   # docker::run { 'elasticsearch':

terraform/vars.tf

@@ -52,20 +52,20 @@ variable "env_vars" {
     SubID       = ""
     vNetName    = "production"
     SubNetName  = "app"
-    SubNetSpace = "10.243.50.0/23"
+    SubNetSpace = "10.20.30.0/23"
 
     #DR
     drlocation    = "westeurope"
     drSubID       = ""
     drvNetName    = "dr"
     drSubNetName  = "app"
-    drSubNetSpace = "10.243.58.0/23"
+    drSubNetSpace = "10.20.60.0/23"
 
     #DEV
     devlocation    = "northeurope"
     devSubID       = ""
     devvNetName    = "sdlc"
     devSubNetName  = "app"
-    devSubNetSpace = "172.21.248.128/25"
+    devSubNetSpace = "172.20.20.128/25"
   }
 }