From 63533666c908220f4993aaa7359107b2fcee8fd5 Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil@lathwood.co.uk>
Date: Thu, 30 Mar 2017 17:04:39 +0100
Subject: [PATCH] Revert "Add missing datasources for postfix app" (#6310)

* Revert "use components for fail2ban jails list (#6221)"

This reverts commit acd11955d20737394c978aac3bf465d8e1d6a6b3.

* Revert "fix: Add missing datasources for postfix app (#6173)"

This reverts commit 3ac4e3c8d5be18ecab486006b69e24bedab31887.
---
 html/includes/graphs/application/postfix_rejects.inc.php | 6 ------
 includes/polling/applications/postfix.inc.php            | 8 +++-----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/html/includes/graphs/application/postfix_rejects.inc.php b/html/includes/graphs/application/postfix_rejects.inc.php
index 766df6e958..726ea414e3 100644
--- a/html/includes/graphs/application/postfix_rejects.inc.php
+++ b/html/includes/graphs/application/postfix_rejects.inc.php
@@ -82,12 +82,6 @@ if (is_file($rrd_filename)) {
             'ds'       => 'iuscp',
             'colour'   => '853A6C'
         ),
-        array(
-            'filename' => $rrd_filename,
-            'descr'    => 'Msg ex limit',
-            'ds'       => 'msefl',
-            'colour'   => '0053EE'
-        ),
         array(
             'filename' => $rrd_filename,
             'descr'    => 'Config Error',
diff --git a/includes/polling/applications/postfix.inc.php b/includes/polling/applications/postfix.inc.php
index 5a9a0c4317..1187a8066e 100644
--- a/includes/polling/applications/postfix.inc.php
+++ b/includes/polling/applications/postfix.inc.php
@@ -16,7 +16,7 @@ list($incomingq, $activeq, $deferredq, $holdq) = explode("\n", $mailq);
 
 list($received, $delivered, $forwarded, $deferred, $bounced, $rejected, $rejectw, $held, $discarded, $bytesr,
      $bytesd, $senders, $sendinghd, $recipients, $recipienthd, $deferralcr, $deferralhid, $chr, $hcrnfqh, $sardnf,
-     $sarnobu, $bu, $raruu, $hcrin, $sarnfqa, $rardnf, $rarnfqa, $iuscp, $msefl, $sce, $scp, $urr) = explode("\n", $detail);
+     $sarnobu, $bu, $raruu, $hcrin, $sarnfqa, $rardnf, $rarnfqa, $iuscp, $sce, $scp, $urr) = explode("\n", $detail);
 
 $rrd_name = array('app', $name, $app_id);
 $rrd_def = RrdDefinition::make()
@@ -54,8 +54,7 @@ $rrd_def = RrdDefinition::make()
     ->addDataset('iuscp', 'GAUGE', 0)
     ->addDataset('sce', 'GAUGE', 0)
     ->addDataset('scp', 'GAUGE', 0)
-    ->addDataset('urr', 'GAUGE', 0)
-    ->addDataset('msefl', 'GAUGE', 0);
+    ->addDataset('urr', 'GAUGE', 0);
 
 $fields = array(
     'incomingq' => $incomingq,
@@ -92,8 +91,7 @@ $fields = array(
     'iuscp' => $iuscp,
     'sce' => $sce,
     'scp' => $scp,
-    'urr' => $urr,
-    'msefl' => $msefl,
+    'urr' => $urr
 );
 
 $tags = array('name' => $name, 'app_id' => $app_id, 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name);