Add alerts and metrics urls as separate options to the different agents

BBVA · Mar 19, 2019 · 494ac97 · 494ac97
1 parent cdb526f
commit 494ac97
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/cmd/agent_auditor.go b/cmd/agent_auditor.go
@@ -40,13 +40,13 @@ func newAgentAuditorCommand(ctx *cmdContext, config gossip.Config, agentPreRun f
 			// must be curried.
 			config = agentPreRun(config)
 
-			// Bindings
-			auditorConfig.MetricsAddr = config.BindAddr // TODO: make MetricsAddr configurable
 			auditorConfig.QEDUrls = v.GetStringSlice("agent.server_urls")
-			auditorConfig.PubUrls = v.GetStringSlice("agent.alert_urls")
+			auditorConfig.PubUrls = v.GetStringSlice("agent.pub_urls")
+			auditorConfig.AlertsUrls = v.GetStringSlice("agent.alerts_urls")
 
 			markSliceStringRequired(auditorConfig.QEDUrls, "qedUrls")
 			markSliceStringRequired(auditorConfig.PubUrls, "pubUrls")
+			markSliceStringRequired(auditorConfig.AlertsUrls, "alertsUrls")
 		},
 		Run: func(cmd *cobra.Command, args []string) {
 
@@ -76,11 +76,11 @@ func newAgentAuditorCommand(ctx *cmdContext, config gossip.Config, agentPreRun f
 
 	f := cmd.Flags()
 	f.StringSliceVarP(&auditorConfig.QEDUrls, "qedUrls", "", []string{}, "Comma-delimited list of QED servers ([host]:port), through which an auditor can make queries")
-	f.StringSliceVarP(&auditorConfig.PubUrls, "pubUrls", "", []string{}, "Comma-delimited list of QED servers ([host]:port), through which an auditor can make queries")
-
+	f.StringSliceVarP(&auditorConfig.PubUrls, "pubUrls", "", []string{}, "Comma-delimited list of store servers ([host]:port), through which an auditor can make queries")
+	f.StringSliceVarP(&auditorConfig.AlertsUrls, "alertsUrls", "", []string{}, "Comma-delimited list of alerts servers ([host]:port), through which an auditor can make queries")
 	// Lookups
 	v.BindPFlag("agent.server_urls", f.Lookup("qedUrls"))
-	v.BindPFlag("agent.alert_urls", f.Lookup("pubUrls"))
-
+	v.BindPFlag("agent.pub_urls", f.Lookup("pubUrls"))
+	v.BindPFlag("agent.alerts_urls", f.Lookup("alertsUrls"))
 	return cmd
 }
diff --git a/cmd/agent_monitor.go b/cmd/agent_monitor.go
@@ -81,7 +81,7 @@ func newAgentMonitorCommand(ctx *cmdContext, config gossip.Config, agentPreRun f
 
 	// Lookups
 	v.BindPFlag("agent.server_urls", f.Lookup("qedUrls"))
-	v.BindPFlag("agent.alert_urls", f.Lookup("pubUrls"))
+	v.BindPFlag("agent.alerts_urls", f.Lookup("alertsUrls"))
 
 	return cmd
 }
diff --git a/cmd/agent_publisher.go b/cmd/agent_publisher.go
@@ -43,8 +43,10 @@ func newAgentPublisherCommand(ctx *cmdContext, config gossip.Config, agentPreRun
 			// Bindings
 			publisherConfig.MetricsAddr = config.BindAddr // TODO: make MetricsAddr configurable
 			publisherConfig.PubUrls = v.GetStringSlice("agent.snapshots_store_urls")
+			publisherConfig.AlertsUrls = v.GetStringSlice("agent.alerts_urls")
 
 			markSliceStringRequired(publisherConfig.PubUrls, "pubUrls")
+			markSliceStringRequired(publisherConfig.AlertsUrls, "alertsUrls")
 		},
 		Run: func(cmd *cobra.Command, args []string) {
 
@@ -72,11 +74,12 @@ func newAgentPublisherCommand(ctx *cmdContext, config gossip.Config, agentPreRun
 	}
 
 	f := cmd.Flags()
-	f.StringSliceVarP(&publisherConfig.PubUrls, "pubUrls", "", []string{},
-		"Comma-delimited list of end-publishers ([host]:port), through which an publisher can send requests")
+	f.StringSliceVarP(&publisherConfig.PubUrls, "pubUrls", "", []string{}, "Comma-delimited list of end-publishers ([host]:port), through which an publisher can send requests")
+	f.StringSliceVarP(&publisherConfig.AlertsUrls, "alertsUrls", "", []string{}, "Comma-delimited list of QED servers ([host]:port), through which an monitor can publish alerts")
 
 	// Lookups
 	v.BindPFlag("agent.snapshots_store_urls", f.Lookup("pubUrls"))
+	v.BindPFlag("agent.alerts_urls", f.Lookup("alertsUrls"))
 
 	return cmd
 }