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

* Add missing datasources for postfix app

* Re-order data
This commit is contained in:
Florian Beer
2017-03-29 23:59:59 +02:00
committed by Neil Lathwood
parent cf509f138b
commit 3ac4e3c8d5
2 changed files with 11 additions and 3 deletions

View File

@@ -82,6 +82,12 @@ if (is_file($rrd_filename)) {
'ds' => 'iuscp', 'ds' => 'iuscp',
'colour' => '853A6C' 'colour' => '853A6C'
), ),
array(
'filename' => $rrd_filename,
'descr' => 'Msg ex limit',
'ds' => 'msefl',
'colour' => '0053EE'
),
array( array(
'filename' => $rrd_filename, 'filename' => $rrd_filename,
'descr' => 'Config Error', 'descr' => 'Config Error',

View File

@@ -16,7 +16,7 @@ list($incomingq, $activeq, $deferredq, $holdq) = explode("\n", $mailq);
list($received, $delivered, $forwarded, $deferred, $bounced, $rejected, $rejectw, $held, $discarded, $bytesr, list($received, $delivered, $forwarded, $deferred, $bounced, $rejected, $rejectw, $held, $discarded, $bytesr,
$bytesd, $senders, $sendinghd, $recipients, $recipienthd, $deferralcr, $deferralhid, $chr, $hcrnfqh, $sardnf, $bytesd, $senders, $sendinghd, $recipients, $recipienthd, $deferralcr, $deferralhid, $chr, $hcrnfqh, $sardnf,
$sarnobu, $bu, $raruu, $hcrin, $sarnfqa, $rardnf, $rarnfqa, $iuscp, $sce, $scp, $urr) = explode("\n", $detail); $sarnobu, $bu, $raruu, $hcrin, $sarnfqa, $rardnf, $rarnfqa, $iuscp, $msefl, $sce, $scp, $urr) = explode("\n", $detail);
$rrd_name = array('app', $name, $app_id); $rrd_name = array('app', $name, $app_id);
$rrd_def = RrdDefinition::make() $rrd_def = RrdDefinition::make()
@@ -54,7 +54,8 @@ $rrd_def = RrdDefinition::make()
->addDataset('iuscp', 'GAUGE', 0) ->addDataset('iuscp', 'GAUGE', 0)
->addDataset('sce', 'GAUGE', 0) ->addDataset('sce', 'GAUGE', 0)
->addDataset('scp', 'GAUGE', 0) ->addDataset('scp', 'GAUGE', 0)
->addDataset('urr', 'GAUGE', 0); ->addDataset('urr', 'GAUGE', 0)
->addDataset('msefl', 'GAUGE', 0);
$fields = array( $fields = array(
'incomingq' => $incomingq, 'incomingq' => $incomingq,
@@ -91,7 +92,8 @@ $fields = array(
'iuscp' => $iuscp, 'iuscp' => $iuscp,
'sce' => $sce, 'sce' => $sce,
'scp' => $scp, 'scp' => $scp,
'urr' => $urr 'urr' => $urr,
'msefl' => $msefl,
); );
$tags = array('name' => $name, 'app_id' => $app_id, 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name); $tags = array('name' => $name, 'app_id' => $app_id, 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name);