fix(docs): fixed influxdb docs and mention of InfluxDB version, grafana#6027

torkelo · torkelo · commit 50d146e82c85 · 2016-09-29T14:53:50.000+02:00
diff --git a/docs/sources/datasources/influxdb.md b/docs/sources/datasources/influxdb.md
@@ -6,11 +6,7 @@ page_keywords: grafana, influxdb, metrics, query, documentation
 
 # InfluxDB
 
-There are currently two separate datasources for InfluxDB in Grafana: InfluxDB 0.8.x and InfluxDB 0.9.x.
-The API and capabilities of InfluxDB 0.9.x are completely different from InfluxDB 0.8.x which is why Grafana handles
-them as different data sources.
-
-InfluxDB 0.9 is rapidly evolving and we continue to track its API. InfluxDB 0.8 is no longer maintained by InfluxDB Inc, but we provide support as a convenience to existing users.
+Grafana ships with very a feature data source plugin for InfluxDB. Supporting a feature rich query editor, annotation and templating queries.
 
 ## Adding the data source
 ![](/img/v2/add_Influx.jpg)
diff --git a/pkg/services/alerting/engine.go b/pkg/services/alerting/engine.go
@@ -144,6 +144,7 @@ func (e *Engine) handleResponse(result *EvalContext) {
 		}
 	}()
 
+	e.log.Info("rule", "nil", result.Rule == nil)
 	e.log.Debug("Alert Rule Result", "ruleId", result.Rule.Id, "firing", result.Firing)
 	e.resultHandler.Handle(result)
 }

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,7 @@ func (e Engine) handleResponse(result EvalContext) {`
`144`	`144`	`}`
`145`	`145`	`}()`
`146`	`146`
	`147`	`+ e.log.Info("rule", "nil", result.Rule == nil)`
`147`	`148`	`e.log.Debug("Alert Rule Result", "ruleId", result.Rule.Id, "firing", result.Firing)`
`148`	`149`	`e.resultHandler.Handle(result)`
`149`	`150`	`}`