Remove mtce_notifier from collectd configuration

The alarm debounce support addition to the fm_notifier
plugin required that the mtce degrade notifier be
merged into the fm_notifier to ensure proper
alarm/degrade accounting.

This merge obsoletes the mtce_notifier.

Unnecessary mtce port config is dropped.

Test Plan:

PASS: Verify collectd configuration after file removal

Change-Id: I560c093faba5c8e9804d51ac625d5c71db662a36
Partial-Bug: 1848580
Depends-On: https://review.opendev.org/#/c/690794/
Signed-off-by: Eric MacDonald <eric.macdonald@windriver.com>

puppet-manifests/centos/build_srpm.data

@@ -1,2 +1,2 @@
 SRC_DIR="src"
-TIS_PATCH_VER=93
+TIS_PATCH_VER=94

puppet-manifests/src/hieradata/global.yaml

@@ -38,8 +38,7 @@ platform::collectd::params::collectd_d_dir: '/etc/collectd.d'
 
 # collectd: module named plugins
 platform::collectd::params::module_path: '/opt/collectd/extensions/python'
-platform::collectd::params::plugins: ['fm_notifier', 'mtce_notifier']
-platform::collectd::params::mtce_notifier_port: 2101
+platform::collectd::params::plugins: ['fm_notifier']
 platform::collectd::params::log_traces: true
 platform::collectd::params::encoding: "utf-8"
 

puppet-manifests/src/modules/platform/manifests/collectd.pp

@@ -12,7 +12,6 @@ class platform::collectd::params (
   # python plugin controls
   $module_path = undef,
   $plugins = [],
-  $mtce_notifier_port = undef,
   $log_traces = undef,
   $encoding = undef,
 

puppet-manifests/src/modules/platform/templates/collectd.conf.erb

@@ -95,11 +95,6 @@ LoadPlugin python
 <%- end -%>
 <%- @plugins.each do |plugin| -%>
     Import "<%= plugin %>"
-<%- if plugin == 'mtce_notifier' -%>
-    <Module "mtce_notifier">
-        Port <%= @mtce_notifier_port %>
-    </Module>
-<%- end -%>
 <%- end -%>
 <%- if @log_traces -%>
     LogTraces <%= @log_traces %>