From 983bc10afad6386c9b34383325f98186878ba258 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Fri, 7 Sep 2018 16:13:46 -0700
Subject: [PATCH] Undeprecate logparser

Until dynamic file tailing can be added to the tail plugin.
---
 CHANGELOG.md                          | 6 ------
 plugins/inputs/logparser/README.md    | 5 -----
 plugins/inputs/logparser/logparser.go | 6 ------
 3 files changed, 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d672e671941f0..247ca4a581338 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,5 @@
 ## v1.8 [unreleased]
 
-### Release Notes
-
-- With the addition of the standalone `grok` input data format, the
-  `logparser` input plugin has been deprecated in favor of using the `tail`
-  input plugin combined with `data_format="grok"` .
-
 ### New Inputs
 
 - [activemq](./plugins/inputs/activemq/README.md) - Contributed by @mlabouardy
diff --git a/plugins/inputs/logparser/README.md b/plugins/inputs/logparser/README.md
index 27cbc3cf44062..94e37f4c286cb 100644
--- a/plugins/inputs/logparser/README.md
+++ b/plugins/inputs/logparser/README.md
@@ -1,7 +1,5 @@
 # Logparser Input Plugin
 
-### **Deprecated in version 1.8**: Please use the [tail](/plugins/inputs/tail) plugin with the `grok` [data format](/docs/DATA_FORMATS_INPUT.md).
-
 The `logparser` plugin streams and parses the given logfiles. Currently it
 has the capability of parsing "grok" patterns from logfiles, which also supports
 regex patterns.
@@ -10,9 +8,6 @@ regex patterns.
 
 ```toml
 [[inputs.logparser]]
-  ## DEPRECATED: The `logparser` plugin is deprecated in 1.8.  Please use the
-  ## `tail` plugin with the grok data_format instead.
-
   ## Log files to parse.
   ## These accept standard unix glob matching rules, but with the addition of
   ## ** as a "super asterisk". ie:
diff --git a/plugins/inputs/logparser/logparser.go b/plugins/inputs/logparser/logparser.go
index b6ce72546992b..bdfa4bacca81d 100644
--- a/plugins/inputs/logparser/logparser.go
+++ b/plugins/inputs/logparser/logparser.go
@@ -54,9 +54,6 @@ type LogParserPlugin struct {
 }
 
 const sampleConfig = `
-  ## DEPRECATED: The 'logparser' plugin is deprecated in 1.8.  Please use the
-  ## 'tail' plugin with the grok data_format as a replacement.
-
   ## Log files to parse.
   ## These accept standard unix glob matching rules, but with the addition of
   ## ** as a "super asterisk". ie:
@@ -126,9 +123,6 @@ func (l *LogParserPlugin) Gather(acc telegraf.Accumulator) error {
 
 // Start kicks off collection of stats for the plugin
 func (l *LogParserPlugin) Start(acc telegraf.Accumulator) error {
-	log.Println("W! DEPRECATED: The logparser plugin is deprecated in 1.8. " +
-		"Please use the tail plugin with the grok data_format as a replacement.")
-
 	l.Lock()
 	defer l.Unlock()