Merge pull request #612 from AmineChikhaoui/fix-611

Datadog monitors: fix #611

nix/datadog-monitor.nix

@@ -18,7 +18,7 @@ with lib;
  name = mkOption {
  default = "datadog-monitor-${uuid}-${name}";
  type = types.str;
- description = "Name of the datadog resource.";
+ description = "Name of the alert which will show up in the subject line of the email.";
  };
  type = mkOption {
  type = types.str;

nixops/datadog_utils.py

@@ -21,4 +21,7 @@ def get_template_variables(defn):
  tvariable['prefix'] = var['prefix']
  tvariable['default'] = var['default']
  template_variables.append(tvariable)
- return template_variables
+ return template_variables
+
+def get_base_url():
+ return "https://app.datadoghq.com/"

nixops/resources/datadog-monitor.py

@@ -42,6 +42,7 @@ def __init__(self, depl, name, id):
  nixops.resources.ResourceState.__init__(self, depl, name, id)
  self._dd_api = None
  self._key_options = None
+ self._monitor_url = nixops.datadog_utils.get_base_url()+"monitors#"
 
  def _exists(self):
  return self.state != self.MISSING
@@ -52,13 +53,17 @@ def show_type(self):
 
  @property
  def resource_id(self):
- r = self.monitor_name
- if self.monitor_id: r = "{0} [ {1} ]".format(r, self.monitor_id)
- return r
-
+ return self._monitor_url + self.monitor_id if self.monitor_id else None
+
  def get_definition_prefix(self):
  return "resources.datadogMonitors."
 
+ def get_physical_spec(self):
+ return {'url': self._monitor_url + self.monitor_id } if self.monitor_id else {} 
+
+ def prefix_definition(self, attr):
+ return {('resources', 'datadogMonitors'): attr}
+
  def connect(self, app_key, api_key):
  if self._dd_api: return
  self._dd_api, self._key_options = nixops.datadog_utils.initializeDatadog(app_key=app_key, api_key=api_key)

nixops/resources/datadog-screenboard.py

@@ -43,16 +43,21 @@ def __init__(self, depl, name, id):
  nixops.resources.ResourceState.__init__(self, depl, name, id)
  self._dd_api = None
  self._key_options = None
+ self._screen_url = nixops.datadog_utils.get_base_url()+"screen/"
 
  def show_type(self):
  s = super(DatadogScreenboardState, self).show_type()
  return s
 
  @property
  def resource_id(self):
- r = self.board_title
- if self.screenboard_id: r = "{0} [ {1} ]".format(r, self.screenboard_id)
- return r
+ return self._screen_url + self.screenboard_id if self.screenboard_id else None
+
+ def get_physical_spec(self):
+ return {'url': self._screen_url + self.screenboard_id } if self.screenboard_id else {} 
+
+ def prefix_definition(self, attr):
+ return {('resources', 'datadogScreenboards'): attr}
 
  def get_definition_prefix(self):
  return "resources.datadogScreenboards."
@@ -121,4 +126,4 @@ def _destroy(self):
 
  def destroy(self, wipe=False):
  self._destroy()
- return True
+ return True

nixops/resources/datadog-timeboard.py

@@ -42,22 +42,21 @@ def __init__(self, depl, name, id):
  nixops.resources.ResourceState.__init__(self, depl, name, id)
  self._dd_api = None
  self._key_options = None
+ self._dash_url = nixops.datadog_utils.get_base_url()+"dash/"
 
  def show_type(self):
  s = super(DatadogTimeboardState, self).show_type()
  return s
 
  @property
  def resource_id(self):
- t = self.title
- if self.url: t = "{0} [ {1} ]".format(t, self.url)
- return t
+ return self._dash_url + self.timeboard_id if self.timeboard_id else None
 
  def prefix_definition(self, attr):
  return {('resources', 'datadogTimeboards'): attr}
 
  def get_physical_spec(self):
- return {'url': self.url}
+ return {'url': self._dash_url + self.timeboard_id } if self.timeboard_id else {} 
 
  def get_definition_prefix(self):
  return "resources.datadogTimeboards."