Merge pull request #55 from stakater/pingdom-support

[STK-227] Pingdom support

Jenkinsfile

@@ -49,7 +49,7 @@ toolsNode(toolsImage: 'stakater/pipeline-tools:1.5.1') {
                 stage('Build Binary') {
                     sh """
                         cd ${srcDir}
-                        go build -o ..out/${repoName.toLowerCase()}
+                        go build -o ../out/${repoName.toLowerCase()}
                     """
                 }
 

README.md

@@ -19,6 +19,7 @@ This controller will continuously watch ingresses in the namespace it is running
 Currently we support the following monitors:
 
 - [UptimeRobot](https://uptimerobot.com)
+- [Pingdom](https://pingdom.com) ([Additional Config](https://github.com/stakater/IngressMonitorController/blob/master/docs/pingdom-configuration.md))
 
 ## Deploying to Kubernetes
 
@@ -83,7 +84,7 @@ type MonitorService interface {
     Update(m Monitor)
     GetByName(name string) (*Monitor, error)
     Remove(m Monitor)
-    Setup(apiKey string, url string, alertContacts string)
+    Setup(provider Provider)
 }
 ```
 

docs/pingdom-configuration.md

@@ -0,0 +1,10 @@
+# Pingdom Configuration
+
+Currently additional pingdom configurations can be added through a set of annotations to each ingress object, the current supported annotations are:
+
+|                        Annotation                        |                    Description                   |
+|:--------------------------------------------------------:|:------------------------------------------------:|
+| monitor.stakater.com/pingdom/resolution                  | The pingdom check interval in minutes            |
+| monitor.stakater.com/pingdom/send-notification-when-down | How many failed check attempts before notifying  |
+| monitor.stakater.com/pingdom/paused                      | Set to "true" to pause checks                    |
+| monitor.stakater.com/pingdom/notify-when-back-up         | Set to "false" to disable recovery notifications |

src/config.go

@@ -18,17 +18,20 @@ type Provider struct {
 	ApiKey        string `yaml:"apiKey"`
 	ApiURL        string `yaml:"apiURL"`
 	AlertContacts string `yaml:"alertContacts"`
+	Username      string `yaml:"username"`
+	Password      string `yaml:"password"`
 }
 
 func (p *Provider) createMonitorService() MonitorServiceProxy {
 	monitorService := (&MonitorServiceProxy{}).OfType(p.Name)
-	monitorService.Setup(p.ApiKey, p.ApiURL, p.AlertContacts)
+	monitorService.Setup(*p)
 	return monitorService
 }
 
 func ReadConfig(filePath string) Config {
 	var config Config
 	// Read YML
+	log.Println("Reading YAML Configuration")
 	source, err := ioutil.ReadFile(filePath)
 	if err != nil {
 		log.Panic(err)

src/controller.go

@@ -20,7 +20,7 @@ const monitorHealthAnnotation = "monitor.stakater.com/healthEndpoint" // "/healt
 
 // MonitorController which can be used for monitoring ingresses
 type MonitorController struct {
-	clientset       *kubernetes.Clientset
+	kubeClient      kubernetes.Interface
 	namespace       string
 	indexer         cache.Indexer
 	queue           workqueue.RateLimitingInterface
@@ -29,19 +29,19 @@ type MonitorController struct {
 	config          Config
 }
 
-func NewMonitorController(namespace string, clientset *kubernetes.Clientset, config Config) *MonitorController {
+func NewMonitorController(namespace string, kubeClient kubernetes.Interface, config Config) *MonitorController {
 	controller := &MonitorController{
-		clientset: clientset,
-		namespace: namespace,
-		config:    config,
+		kubeClient: kubeClient,
+		namespace:  namespace,
+		config:     config,
 	}
 
 	controller.monitorServices = setupMonitorServicesForProviders(config.Providers)
 
 	queue := workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter())
 
 	// Create the Ingress Watcher
-	ingressListWatcher := cache.NewListWatchFromClient(clientset.ExtensionsV1beta1().RESTClient(), "ingresses", namespace, fields.Everything())
+	ingressListWatcher := cache.NewListWatchFromClient(kubeClient.ExtensionsV1beta1().RESTClient(), "ingresses", namespace, fields.Everything())
 
 	indexer, informer := cache.NewIndexerInformer(ingressListWatcher, &v1beta1.Ingress{}, 0, cache.ResourceEventHandlerFuncs{
 		AddFunc:    controller.onIngressAdded,
@@ -154,9 +154,9 @@ func (c *MonitorController) getMonitorName(ingressName string, namespace string)
 
 func (c *MonitorController) getMonitorURL(ingress *v1beta1.Ingress) string {
 	ingressWrapper := IngressWrapper{
-		ingress:   ingress,
-		namespace: c.namespace,
-		clientset: c.clientset,
+		ingress:    ingress,
+		namespace:  c.namespace,
+		kubeClient: c.kubeClient,
 	}
 
 	return ingressWrapper.getURL()
@@ -174,7 +174,7 @@ func (c *MonitorController) handleIngressOnCreationOrUpdation(ingress *v1beta1.I
 	if value, ok := annotations[monitorEnabledAnnotation]; ok {
 		if value == "true" {
 			// Annotation exists and is enabled
-			c.createOrUpdateMonitors(monitorName, monitorURL)
+			c.createOrUpdateMonitors(monitorName, monitorURL, annotations)
 		} else {
 			// Annotation exists but is disabled
 			c.removeMonitorsIfExist(monitorName)
@@ -202,26 +202,31 @@ func (c *MonitorController) removeMonitorIfExists(monitorService MonitorServiceP
 	}
 }
 
-func (c *MonitorController) createOrUpdateMonitors(monitorName string, monitorURL string) {
+func (c *MonitorController) createOrUpdateMonitors(monitorName string, monitorURL string, annotations map[string]string) {
 	for index := 0; index < len(c.monitorServices); index++ {
 		monitorService := c.monitorServices[index]
-		c.createOrUpdateMonitor(monitorService, monitorName, monitorURL)
+		c.createOrUpdateMonitor(monitorService, monitorName, monitorURL, annotations)
 	}
 }
 
-func (c *MonitorController) createOrUpdateMonitor(monitorService MonitorServiceProxy, monitorName string, monitorURL string) {
+func (c *MonitorController) createOrUpdateMonitor(monitorService MonitorServiceProxy, monitorName string, monitorURL string, annotations map[string]string) {
 	m, _ := monitorService.GetByName(monitorName)
 
 	if m != nil { // Monitor Already Exists
 		log.Println("Monitor already exists for ingress: " + monitorName)
 		if m.url != monitorURL { // Monitor does not have the same url
 			// update the monitor with the new url
 			m.url = monitorURL
+			m.annotations = annotations
 			monitorService.Update(*m)
 		}
 	} else {
 		// Create a new monitor for this ingress
-		m := Monitor{name: monitorName, url: monitorURL}
+		m := Monitor{
+			name:        monitorName,
+			url:         monitorURL,
+			annotations: annotations,
+		}
 		monitorService.Add(m)
 	}
 }