tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add a removal note for enable_legacy_mode for GraphiteWriter 

refs #4992
This commit is contained in:
Michael Friedrich 2017-02-10 11:33:32 +01:00
parent 31650b0beb
commit 3993276b74
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/14-features.md
View File

@ -251,6 +251,10 @@ Cache.
#### <a id="graphite-carbon-cache-writer-schema-legacy"></a> Graphite Schema < 2.4
> **Note**
>
> This legacy mode will be removed in 2.8.
In order to restore the old legacy schema, you'll need to adopt the `GraphiteWriter`
configuration:

2
doc/9-object-types.md
View File

@ -553,7 +553,7 @@ Configuration Attributes:
service_name_template |**Optional.** Metric prefix for service name. Defaults to "icinga2.$host.name$.services.$service.name$.$service.check_command$".
enable_send_thresholds | **Optional.** Send additional threshold metrics. Defaults to `false`.
enable_send_metadata | **Optional.** Send additional metadata metrics. Defaults to `false`.
enable_legacy_mode | **Optional.** Enable legacy mode for schema < 2.4. **Note**: This will be removed in future versions.
enable_legacy_mode | **Optional.** Enable legacy mode for schema < 2.4. **Note**: This will be removed in 2.8.
Additional usage examples can be found [here](14-features.md#graphite-carbon-cache-writer).

2
lib/perfdata/graphitewriter.cpp
View File

@ -127,7 +127,7 @@ void GraphiteWriter::CheckResultHandler(const Checkable::Ptr& checkable, const C
double ts = cr->GetExecutionEnd();
/* new mode below. old mode in else tree with 2.4, deprecate it in 2.6 */
/* new mode below. old mode in else tree with 2.4, deprecate it in 2.6, remove in 2.8 TODO */
if (!GetEnableLegacyMode()) {
if (service) {
prefix = MacroProcessor::ResolveMacros(GetServiceNameTemplate(), resolvers, cr, NULL, boost::bind(&GraphiteWriter::EscapeMacroMetric, _1, false));