migrate teams and recipients fields to responders

czunker · May 23, 2019 · 98317d1 · 98317d1
1 parent c5db2ae
commit 98317d1
Show file tree

Hide file tree

Showing 42 changed files with 107 additions and 242 deletions.
diff --git a/bmcFootPrintsV11/bmcFootPrintsV11/bmcFootPrints2opsgenie.go b/bmcFootPrintsV11/bmcFootPrintsV11/bmcFootPrints2opsgenie.go
@@ -489,9 +489,8 @@ func parseFlags() {
 
 	logPath := flag.String("logPath", "", "LOGPATH")
 
-	recipients := flag.String("recipients", "", "Recipients")
+	responders := flag.String("responders", "", "Responders")
 	tags := flag.String("tags", "", "Tags")
-	teams := flag.String("teams", "", "Teams")
 	url := flag.String("url", "", "")
 	username := flag.String("username", "", "Username")
 	password := flag.String("password", "", "Password")
@@ -512,16 +511,10 @@ func parseFlags() {
 		parameters["apiKey"] = configParameters ["apiKey"]
 	}
 
-	if *recipients != "" {
-		parameters["recipients"] = *recipients
+	if *responders != "" {
+		parameters["responders"] = *responders
 	} else {
-		parameters["recipients"] = configParameters ["recipients"]
-	}
-
-	if *teams != "" {
-		parameters["teams"] = *teams
-	} else {
-		parameters["teams"] = configParameters ["teams"]
+		parameters["responders"] = configParameters ["responders"]
 	}
 
 	if *tags != "" {

diff --git a/bmcFootPrintsV11Incoming/bmcFootPrintsV11/bmcFootPrints2opsgenie.go b/bmcFootPrintsV11Incoming/bmcFootPrintsV11/bmcFootPrints2opsgenie.go
@@ -489,9 +489,8 @@ func parseFlags() {
 
 	logPath := flag.String("logPath", "", "LOGPATH")
 
-	recipients := flag.String("recipients", "", "Recipients")
 	tags := flag.String("tags", "", "Tags")
-	teams := flag.String("teams", "", "Teams")
+	responders := flag.String("responders", "", "Responders")
 	url := flag.String("url", "", "")
 	username := flag.String("username", "", "Username")
 	password := flag.String("password", "", "Password")
@@ -512,16 +511,10 @@ func parseFlags() {
 		parameters["apiKey"] = configParameters ["apiKey"]
 	}
 
-	if *recipients != "" {
-		parameters["recipients"] = *recipients
+	if *responders != "" {
+		parameters["responders"] = *responders
 	} else {
-		parameters["recipients"] = configParameters ["recipients"]
-	}
-
-	if *teams != "" {
-		parameters["teams"] = *teams
-	} else {
-		parameters["teams"] = configParameters ["teams"]
+		parameters["responders"] = configParameters ["responders"]
 	}
 
 	if *tags != "" {

diff --git a/bmcFootPrintsV12/bmcFootPrintsV12/bmcFootPrints2opsgenie.go b/bmcFootPrintsV12/bmcFootPrintsV12/bmcFootPrints2opsgenie.go
@@ -581,9 +581,8 @@ func parseFlags() {
 
 	logPath := flag.String("logPath", "", "LOGPATH")
 
-	recipients := flag.String("recipients", "", "Recipients")
 	tags := flag.String("tags", "", "Tags")
-	teams := flag.String("teams", "", "Teams")
+	responders := flag.String("responders", "", "Responders")
 	url := flag.String("url", "", "")
 	username := flag.String("username", "", "Username")
 	password := flag.String("password", "", "Password")
@@ -603,16 +602,10 @@ func parseFlags() {
 		parameters["apiKey"] = configParameters ["apiKey"]
 	}
 
-	if *recipients != "" {
-		parameters["recipients"] = *recipients
+	if *responders != "" {
+		parameters["responders"] = *responders
 	} else {
-		parameters["recipients"] = configParameters ["recipients"]
-	}
-
-	if *teams != "" {
-		parameters["teams"] = *teams
-	} else {
-		parameters["teams"] = configParameters ["teams"]
+		parameters["responders"] = configParameters ["responders"]
 	}
 
 	if *tags != "" {

diff --git a/bmcFootPrintsV12Incoming/bmcFootPrintsV12/bmcFootPrints2opsgenie.go b/bmcFootPrintsV12Incoming/bmcFootPrintsV12/bmcFootPrints2opsgenie.go
@@ -581,9 +581,8 @@ func parseFlags() {
 
 	logPath := flag.String("logPath", "", "LOGPATH")
 
-	recipients := flag.String("recipients", "", "Recipients")
 	tags := flag.String("tags", "", "Tags")
-	teams := flag.String("teams", "", "Teams")
+	responders := flag.String("responders", "", "Responders")
 	url := flag.String("url", "", "")
 	username := flag.String("username", "", "Username")
 	password := flag.String("password", "", "Password")
@@ -603,16 +602,10 @@ func parseFlags() {
 		parameters["apiKey"] = configParameters ["apiKey"]
 	}
 
-	if *recipients != "" {
-		parameters["recipients"] = *recipients
+	if *responders != "" {
+		parameters["responders"] = *responders
 	} else {
-		parameters["recipients"] = configParameters ["recipients"]
-	}
-
-	if *teams != "" {
-		parameters["teams"] = *teams
-	} else {
-		parameters["teams"] = configParameters ["teams"]
+		parameters["responders"] = configParameters ["responders"]
 	}
 
 	if *tags != "" {

diff --git a/custom-integration-scripts/op5/marid.conf b/custom-integration-scripts/op5/marid.conf
@@ -2,9 +2,8 @@
 #you can define log levels: warning, debug, info,error
 nagios2opsgenie.logger=warning
 nagios2opsgenie.timeout= 60
-#recipients=<comma_separated_list_of_recipients>
+#responders=<comma_separated_list_of_responders>
 #tags=<comma_separated_list_of_tags>
-#teams=<comma_separated_list_of_teams>
 
 #You can use different nagiosServer values for each of your Nagios servers (see marid configuration below)
 nagios_server=default

diff --git a/icinga/common/opsgenie-integration.conf.part b/icinga/common/opsgenie-integration.conf.part
@@ -3,9 +3,8 @@
 icinga2opsgenie.logger=warning
 icinga2opsgenie.timeout=60
 logPath=/var/log/opsgenie/icinga2opsgenie.log
-#recipients=<comma_separated_list_of_recipients>
 #tags=<comma_separated_list_of_tags>
-#teams=<comma_separated_list_of_teams>
+#responders=<comma_separated_list_of_responders>
 
 #You can use different icingaServer values for each of your Icinga servers (see marid configuration below)
 icinga_server=default

diff --git a/icinga/icinga/icinga2opsgenie.go b/icinga/icinga/icinga2opsgenie.go
@@ -332,9 +332,8 @@ func parseFlags()map[string]string{
 	serviceCheckCommand := flag.String("sc", "", "SERVICECHECKCOMMAND")
 	logPath := flag.String("logPath", "", "LOGPATH")
 
-	recipients := flag.String("recipients","","Recipients")
+	responders := flag.String("responders","","Responders")
 	tags := flag.String("tags","","Tags")
-	teams := flag.String("teams","","Teams")
 
 	flag.Parse()
 
@@ -349,10 +348,10 @@ func parseFlags()map[string]string{
 		parameters["icinga_server"] = configParameters["icinga_server"]
 	}
 
-	if *recipients != ""{
-		parameters["recipients"] = *recipients
+	if *responders != ""{
+		parameters["responders"] = *responders
 	}else{
-		parameters["recipients"] = configParameters ["recipients"]
+		parameters["responders"] = configParameters ["responders"]
 	}
 
 	if *tags != ""{
@@ -361,11 +360,6 @@ func parseFlags()map[string]string{
 		parameters["tags"] = configParameters ["tags"]
 	}
 
-	if *teams != ""{
-		parameters["teams"] = *teams
-	}else{
-		parameters["teams"] = configParameters ["teams"]
-	}
 
 	if *logPath != "" {
 		parameters["logPath"] = *logPath

diff --git a/icinga2/common/opsgenie-integration.conf.part b/icinga2/common/opsgenie-integration.conf.part
@@ -3,9 +3,8 @@
 icinga2opsgenie.logger=warning
 icinga2opsgenie.timeout=60
 logPath=/var/log/opsgenie/icinga2opsgenie.log
-#recipients=<comma_separated_list_of_recipients>
+#responders=<comma_separated_list_of_responders>
 #tags=<comma_separated_list_of_tags>
-#teams=<comma_separated_list_of_teams>
 
 #You can use different icingaServer values for each of your Icinga servers (see marid configuration below)
 icinga_server=default

diff --git a/icinga2/icinga2/icinga2opsgenie.go b/icinga2/icinga2/icinga2opsgenie.go
@@ -306,9 +306,8 @@ func parseFlags()map[string]string{
 	serviceCheckCommand := flag.String("sc", "", "SERVICECHECKCOMMAND")
 	logPath := flag.String("logPath", "", "LOGPATH")
 
-	recipients := flag.String("recipients","","Recipients")
+	responders := flag.String("responders","","Responders")
 	tags := flag.String("tags","","Tags")
-	teams := flag.String("teams","","Teams")
 
 	flag.Parse()
 
@@ -323,10 +322,10 @@ func parseFlags()map[string]string{
 		parameters["icinga_server"] = configParameters["icinga_server"]
 	}
 
-	if *recipients != ""{
-		parameters["recipients"] = *recipients
+	if *responders != ""{
+		parameters["responders"] = *responders
 	}else{
-		parameters["recipients"] = configParameters ["recipients"]
+		parameters["responders"] = configParameters ["responders"]
 	}
 
 	if *tags != ""{
@@ -335,12 +334,6 @@ func parseFlags()map[string]string{
 		parameters["tags"] = configParameters ["tags"]
 	}
 
-	if *teams != ""{
-		parameters["teams"] = *teams
-	}else{
-		parameters["teams"] = configParameters ["teams"]
-	}
-
 	if *logPath != "" {
 		parameters["logPath"] = *logPath
 	} else {

diff --git a/icinga2Incoming/common/opsgenie-integration.conf b/icinga2Incoming/common/opsgenie-integration.conf
@@ -3,9 +3,8 @@
 icinga2opsgenie.logger = warning
 icinga2opsgenie.timeout = 60
 logPath = /var/log/opsgenie/icinga2opsgenie.log
-#recipients=<comma_separated_list_of_recipients>
+#responders=<comma_separated_list_of_responders>
 #tags=<comma_separated_list_of_tags>
-#teams=<comma_separated_list_of_teams>
 
 #You can use different icingaServer values for each of your Icinga servers (see marid configuration below)
 icinga_server = default

diff --git a/icinga2Incoming/icinga2/icinga2opsgenie.go b/icinga2Incoming/icinga2/icinga2opsgenie.go
@@ -305,9 +305,8 @@ func parseFlags() map[string]string {
 	serviceCheckCommand := flag.String("sc", "", "SERVICECHECKCOMMAND")
 	logPath := flag.String("logPath", "", "LOGPATH")
 
-	recipients := flag.String("recipients", "", "Recipients")
+	responders := flag.String("responders", "", "Responders")
 	tags := flag.String("tags", "", "Tags")
-	teams := flag.String("teams", "", "Teams")
 
 	flag.Parse()
 
@@ -322,10 +321,10 @@ func parseFlags() map[string]string {
 		parameters["icinga_server"] = configParameters["icinga_server"]
 	}
 
-	if *recipients != "" {
-		parameters["recipients"] = *recipients
+	if *responders != "" {
+		parameters["responders"] = *responders
 	} else {
-		parameters["recipients"] = configParameters ["recipients"]
+		parameters["responders"] = configParameters ["responders"]
 	}
 
 	if *tags != "" {
@@ -334,12 +333,6 @@ func parseFlags() map[string]string {
 		parameters["tags"] = configParameters ["tags"]
 	}
 
-	if *teams != "" {
-		parameters["teams"] = *teams
-	} else {
-		parameters["teams"] = configParameters ["teams"]
-	}
-
 	if *logPath != "" {
 		parameters["logPath"] = *logPath
 	} else {

diff --git a/icingaIncoming/common/opsgenie-integration.conf b/icingaIncoming/common/opsgenie-integration.conf
@@ -3,9 +3,8 @@
 icinga2opsgenie.logger = warning
 icinga2opsgenie.timeout = 60
 logPath = /var/log/opsgenie/icinga2opsgenie.log
-#recipients=<comma_separated_list_of_recipients>
+#responders=<comma_separated_list_of_responders>
 #tags=<comma_separated_list_of_tags>
-#teams=<comma_separated_list_of_teams>
 
 #You can use different icingaServer values for each of your Icinga servers (see marid configuration below)
 icinga_server = default

diff --git a/icingaIncoming/icinga/icinga2opsgenie.go b/icingaIncoming/icinga/icinga2opsgenie.go
@@ -329,9 +329,8 @@ func parseFlags() map[string]string {
 	serviceCheckCommand := flag.String("sc", "", "SERVICECHECKCOMMAND")
 	logPath := flag.String("logPath", "", "LOGPATH")
 
-	recipients := flag.String("recipients", "", "Recipients")
+	responders := flag.String("responders", "", "Responders")
 	tags := flag.String("tags", "", "Tags")
-	teams := flag.String("teams", "", "Teams")
 
 	flag.Parse()
 
@@ -346,10 +345,10 @@ func parseFlags() map[string]string {
 		parameters["icinga_server"] = configParameters["icinga_server"]
 	}
 
-	if *recipients != "" {
-		parameters["recipients"] = *recipients
+	if *responders != "" {
+		parameters["responders"] = *responders
 	} else {
-		parameters["recipients"] = configParameters ["recipients"]
+		parameters["responders"] = configParameters ["responders"]
 	}
 
 	if *tags != "" {
@@ -358,12 +357,6 @@ func parseFlags() map[string]string {
 		parameters["tags"] = configParameters ["tags"]
 	}
 
-	if *teams != "" {
-		parameters["teams"] = *teams
-	} else {
-		parameters["teams"] = configParameters ["teams"]
-	}
-
 	if *logPath != "" {
 		parameters["logPath"] = *logPath
 	} else {

diff --git a/nagios/common/opsgenie-integration.conf.part b/nagios/common/opsgenie-integration.conf.part
@@ -3,9 +3,8 @@
 nagios2opsgenie.logger=warning
 nagios2opsgenie.timeout= 60
 logPath=/var/log/opsgenie/nagios2opsgenie.log
-#recipients=<comma_separated_list_of_recipients>
+#responders=<comma_separated_list_of_responders>
 #tags=<comma_separated_list_of_tags>
-#teams=<comma_separated_list_of_teams>
 
 #You can use different nagiosServer values for each of your Nagios servers (see marid configuration below)
 nagios_server=default

diff --git a/nagios/nagios/nagios2opsgenie.go b/nagios/nagios/nagios2opsgenie.go
@@ -326,9 +326,8 @@ func parseFlags()map[string]string{
 	servicePerfData := flag.String("spd", "", "SERVICEPERFDATA")
 	logPath := flag.String("logPath", "", "LOGPATH")
 
-	recipients := flag.String("recipients","","Recipients")
+	responders := flag.String("responders","","Responders")
 	tags := flag.String("tags","","Tags")
-	teams := flag.String("teams","","Teams")
 
 	flag.Parse()
 
@@ -343,16 +342,10 @@ func parseFlags()map[string]string{
 		parameters["nagios_server"] = configParameters["nagios_server"]
 	}
 
-	if *recipients != ""{
-		parameters["recipients"] = *recipients
+	if *responders != ""{
+		parameters["responders"] = *responders
 	}else{
-		parameters["recipients"] = configParameters ["recipients"]
-	}
-
-	if *teams != ""{
-		parameters["teams"] = *teams
-	}else{
-		parameters["teams"] = configParameters ["teams"]
+		parameters["responders"] = configParameters ["responders"]
 	}
 
 	if *tags != ""{

diff --git a/nagiosIncoming/common/opsgenie-integration.conf b/nagiosIncoming/common/opsgenie-integration.conf
@@ -3,9 +3,8 @@
 nagios2opsgenie.logger = warning
 nagios2opsgenie.timeout = 60
 logPath = /var/log/opsgenie/nagios2opsgenie.log
-#recipients=<comma_separated_list_of_recipients>
+#responders=<comma_separated_list_of_responders>
 #tags=<comma_separated_list_of_tags>
-#teams=<comma_separated_list_of_teams>
 
 #You can use different nagiosServer values for each of your Nagios servers (see marid configuration below)
 nagios_server = default