* telegraf merge conflicts

* remove ent specific configs from oss and move to ent chart

* Revert "telegraf merge conflicts"

This reverts commit 5b9d593cde41ab8443826cea30dcb3f1d8a3047c.

* removes extra whitespace

* version bumps