mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add additional type tag for Bind metrics (#13581)

Browse Source 
* Add additional type tag for Bind metrics
Fixes data getting clobbered when exported to external TSDB.
Fixes 13539

* Update bind.inc.php
This commit is contained in:
Tony Murray
2021-12-02 08:05:04 -06:00
committed by GitHub
parent 1675cd8c17
commit ccda5472c0
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
includes/polling/applications/bind.inc.php
View File

@@ -53,7 +53,7 @@ $fields = [
];
$metrics['queries'] = $fields;
$tags = ['name' => $name, 'app_id' => $app_id, 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name];
$tags = ['name' => $name, 'app_id' => $app_id, 'type' => 'incoming', 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name];
data_update($device, 'app', $tags, $fields);
$rrd_name = ['app', $name, $app_id, 'incoming'];
@@ -127,7 +127,7 @@ $fields = [
];
$metrics['incoming'] = $fields;
$tags = ['name' => $name, 'app_id' => $app_id, 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name];
$tags = ['name' => $name, 'app_id' => $app_id, 'type' => 'incoming_extended', 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name];
data_update($device, 'app', $tags, $fields);
//
@@ -228,7 +228,7 @@ $fields = [
];
$metrics['outgoing'] = $fields;
$tags = ['name' => $name, 'app_id' => $app_id, 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name];
$tags = ['name' => $name, 'app_id' => $app_id, 'type' => 'outgoing', 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name];
data_update($device, 'app', $tags, $fields);
//
@@ -288,7 +288,7 @@ $fields = [
];
$metrics['server'] = $fields;
$tags = ['name' => $name, 'app_id' => $app_id, 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name];
$tags = ['name' => $name, 'app_id' => $app_id, 'type' => 'server', 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name];
data_update($device, 'app', $tags, $fields);
//
@@ -353,7 +353,7 @@ $fields = [
];
$metrics['resolver'] = $fields;
$tags = ['name' => $name, 'app_id' => $app_id, 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name];
$tags = ['name' => $name, 'app_id' => $app_id, 'type' => 'resolver', 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name];
data_update($device, 'app', $tags, $fields);
//
@@ -420,7 +420,7 @@ $fields = [
];
$metrics['adb'] = $fields;
$tags = ['name' => $name, 'app_id' => $app_id, 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name];
$tags = ['name' => $name, 'app_id' => $app_id, 'type' => 'adb', 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name];
data_update($device, 'app', $tags, $fields);
//
@@ -509,7 +509,7 @@ $fields = [
];
$metrics['sockets'] = $fields;
$tags = ['name' => $name, 'app_id' => $app_id, 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name];
$tags = ['name' => $name, 'app_id' => $app_id, 'type' => 'sockets', 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name];
data_update($device, 'app', $tags, $fields);
//
@@ -618,7 +618,7 @@ $fields = [
];
$metrics['rrpositive'] = $fields;
$tags = ['name' => $name, 'app_id' => $app_id, 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name];
$tags = ['name' => $name, 'app_id' => $app_id, 'type' => 'rrpositive', 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name];
data_update($device, 'app', $tags, $fields);
// now handle the negative
@@ -671,6 +671,6 @@ $fields = [
];
$metrics['rrnegative'] = $fields;
$tags = ['name' => $name, 'app_id' => $app_id, 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name];
$tags = ['name' => $name, 'app_id' => $app_id, 'type' => 'rrnegative', 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name];
data_update($device, 'app', $tags, $fields);
update_application($app, $bind, $metrics);