Merge pull request #221 from paulsp/KARAF-6983
[KARAF-6983] Add property "replaceDotsByUnderscores" to the configura…
diff --git a/alerting/service/src/main/cfg/org.apache.karaf.decanter.alerting.service.cfg b/alerting/service/src/main/cfg/org.apache.karaf.decanter.alerting.service.cfg
index eb76527..1f6b269 100644
--- a/alerting/service/src/main/cfg/org.apache.karaf.decanter.alerting.service.cfg
+++ b/alerting/service/src/main/cfg/org.apache.karaf.decanter.alerting.service.cfg
@@ -20,5 +20,5 @@
# You can define your alert rules here.
# The rule key has to start with rule. prefix.
# For instance, a rule looks like
-# rule.myfirstrule = "{'condition':'message:*','severity':'WARN'}"
-# rule.mysecondrule = "{'condition':'threadCount:[200 TO *]','severity':'ERROR','recoverable':true}"
\ No newline at end of file
+# rule.myfirstrule = "{'condition':'message:*','level':'WARN'}"
+# rule.mysecondrule = "{'condition':'threadCount:[200 TO *]','level':'ERROR','recoverable':true}"
diff --git a/manual/src/main/asciidoc/user-guide/alerting.adoc b/manual/src/main/asciidoc/user-guide/alerting.adoc
index 0f05557..ca298b8 100644
--- a/manual/src/main/asciidoc/user-guide/alerting.adoc
+++ b/manual/src/main/asciidoc/user-guide/alerting.adoc
@@ -25,7 +25,7 @@
the alert rules:
----
-rule.my="{'condition':'message:*','level':'ERROR'}
+rule.my="{'condition':'message:*','level':'ERROR'}"
----
The rule name has to start with `rule.` prefix (see `rule.my` here).
@@ -64,6 +64,7 @@
* `alertUUID` is a unique string generated by the alert service
* `alertTimestamp` is the alert timestamp added by the alert service
+* `decanter.collector.name` is the name of the origintating Decanter collector
==== Alerters
@@ -83,6 +84,9 @@
This alerter doesn't need any configuration.
+CAUTION: Use the Alerter Log with caution when also using the Log Collector, decanter-collector-log, as you can create a loop. Specifically a
+log event will generate an alert event that will generate a log event.....
+
===== E-mail
The Decanter e-mail alerter sends an e-mail for alerts.
