Merge pull request #2684 from influxdata/fix/kapa-idvar-no-groups

Update TICKscripts to not have .Group templates when no group by

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### UI Improvements
 1. [#2698](https://github.com/influxdata/chronograf/pull/2698): Improve clarity of terminology surrounding InfluxDB & Kapacitor connections
 ### Bug Fixes
+1. [#2684](https://github.com/influxdata/chronograf/pull/2684): Fix TICKscript Sensu alerts when no group by tags selected
 
 ## v1.4.0.1 [2017-1-9]
 ### Features

kapacitor/client_test.go

@@ -1293,7 +1293,157 @@ func TestClient_Create(t *testing.T) {
 		createTaskOptions *client.CreateTaskOptions
 	}{
 		{
-			name: "create alert rule",
+			name: "create alert rule with tags",
+			fields: fields{
+				kapaClient: func(url, username, password string, insecureSkipVerify bool) (KapaClient, error) {
+					return kapa, nil
+				},
+				Ticker: &Alert{},
+				ID: &MockID{
+					ID: "howdy",
+				},
+			},
+			args: args{
+				ctx: context.Background(),
+				rule: chronograf.AlertRule{
+					ID:   "howdy",
+					Name: "myname's",
+					Query: &chronograf.QueryConfig{
+						Database:        "db",
+						RetentionPolicy: "rp",
+						Measurement:     "meas",
+						GroupBy: chronograf.GroupBy{
+							Tags: []string{
+								"tag1",
+								"tag2",
+							},
+						},
+					},
+					Trigger: Deadman,
+					TriggerValues: chronograf.TriggerValues{
+						Period: "1d",
+					},
+				},
+			},
+			resTask: client.Task{
+				ID:     "chronograf-v1-howdy",
+				Status: client.Enabled,
+				Type:   client.StreamTask,
+				DBRPs: []client.DBRP{
+					{
+						Database:        "db",
+						RetentionPolicy: "rp",
+					},
+				},
+				Link: client.Link{
+					Href: "/kapacitor/v1/tasks/chronograf-v1-howdy",
+				},
+			},
+			createTaskOptions: &client.CreateTaskOptions{
+				TICKscript: `var db = 'db'
+
+var rp = 'rp'
+
+var measurement = 'meas'
+
+var groupBy = ['tag1', 'tag2']
+
+var whereFilter = lambda: TRUE
+
+var period = 1d
+
+var name = 'myname\'s'
+
+var idVar = name + ':{{.Group}}'
+
+var message = ''
+
+var idTag = 'alertID'
+
+var levelTag = 'level'
+
+var messageField = 'message'
+
+var durationField = 'duration'
+
+var outputDB = 'chronograf'
+
+var outputRP = 'autogen'
+
+var outputMeasurement = 'alerts'
+
+var triggerType = 'deadman'
+
+var threshold = 0.0
+
+var data = stream
+    |from()
+        .database(db)
+        .retentionPolicy(rp)
+        .measurement(measurement)
+        .groupBy(groupBy)
+        .where(whereFilter)
+
+var trigger = data
+    |deadman(threshold, period)
+        .stateChangesOnly()
+        .message(message)
+        .id(idVar)
+        .idTag(idTag)
+        .levelTag(levelTag)
+        .messageField(messageField)
+        .durationField(durationField)
+
+trigger
+    |eval(lambda: "emitted")
+        .as('value')
+        .keep('value', messageField, durationField)
+    |eval(lambda: float("value"))
+        .as('value')
+        .keep()
+    |influxDBOut()
+        .create()
+        .database(outputDB)
+        .retentionPolicy(outputRP)
+        .measurement(outputMeasurement)
+        .tag('alertName', name)
+        .tag('triggerType', triggerType)
+
+trigger
+    |httpOut('output')
+`,
+
+				ID:     "chronograf-v1-howdy",
+				Type:   client.StreamTask,
+				Status: client.Enabled,
+				DBRPs: []client.DBRP{
+					{
+						Database:        "db",
+						RetentionPolicy: "rp",
+					},
+				},
+			},
+			want: &Task{
+				ID:         "chronograf-v1-howdy",
+				Href:       "/kapacitor/v1/tasks/chronograf-v1-howdy",
+				HrefOutput: "/kapacitor/v1/tasks/chronograf-v1-howdy/output",
+				Rule: chronograf.AlertRule{
+					Type: "stream",
+					DBRPs: []chronograf.DBRP{
+						{
+
+							DB: "db",
+							RP: "rp",
+						},
+					},
+					Status: "enabled",
+					ID:     "chronograf-v1-howdy",
+					Name:   "chronograf-v1-howdy",
+				},
+			},
+		},
+		{
+			name: "create alert rule with no tags",
 			fields: fields{
 				kapaClient: func(url, username, password string, insecureSkipVerify bool) (KapaClient, error) {
 					return kapa, nil
@@ -1348,7 +1498,7 @@ var period = 1d
 
 var name = 'myname\'s'
 
-var idVar = name + ':{{.Group}}'
+var idVar = name
 
 var message = ''
 

kapacitor/vars.go

@@ -123,7 +123,7 @@ func commonVars(rule chronograf.AlertRule) (string, error) {
 		%s
 
 		var name = '%s'
-		var idVar = name + ':{{.Group}}'
+		var idVar = %s
 		var message = '%s'
 		var idTag = '%s'
 		var levelTag = '%s'
@@ -143,6 +143,7 @@ func commonVars(rule chronograf.AlertRule) (string, error) {
 		whereFilter(rule.Query),
 		wind,
 		Escape(rule.Name),
+		idVar(rule.Query),
 		Escape(rule.Message),
 		IDTag,
 		LevelTag,
@@ -197,6 +198,13 @@ func groupBy(q *chronograf.QueryConfig) string {
 	return "[" + strings.Join(groups, ",") + "]"
 }
 
+func idVar(q *chronograf.QueryConfig) string {
+	if len(q.GroupBy.Tags) > 0 {
+		return `name + ':{{.Group}}'`
+	}
+	return "name"
+}
+
 func field(q *chronograf.QueryConfig) (string, error) {
 	if q == nil {
 		return "", fmt.Errorf("No fields set in query")