Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

convert zfs over to use json_app_get #8573

Merged
merged 20 commits into from Aug 19, 2018
Merged

convert zfs over to use json_app_get #8573

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
484745f
convert zfs over to use json_app_get
VVelox Apr 17, 2018
af7d48c
make the format checker happy
VVelox Apr 17, 2018
2ac866f
change array brackets used and update for upcomming changes to json_a…
VVelox Apr 18, 2018
3d220c0
change it over to do exception checking
VVelox Apr 23, 2018
2b8f111
styling cleanup
VVelox Apr 24, 2018
e3af27c
cleanup error handling
VVelox May 1, 2018
b591ea4
update to the latest json_app_get
VVelox May 28, 2018
f1f0189
correct a bit of logic for legacy and cleanup some formatting
VVelox May 28, 2018
4499e45
add the snmprec files for the ZFS app
VVelox Jun 13, 2018
dcab129
add the tests for ZFS with legacy extend
VVelox Jun 13, 2018
ce0dd57
add another check
VVelox Jun 19, 2018
6e1ad38
convert these from base64 to hex
VVelox Aug 15, 2018
6b345fd
remove improper commas
VVelox Aug 15, 2018
fa9e0b2
Merge remote-tracking branch 'upstream/master' into json
murrant Aug 17, 2018
3e1f704
Match upstream spacing
murrant Aug 17, 2018
30b9e3a
fix typo
murrant Aug 17, 2018
b5e4939
fix bad data and zfs metrics, allow float values
murrant Aug 17, 2018
e0aaf51
bad capture
murrant Aug 17, 2018
97d6834
improve comment
murrant Aug 17, 2018
414ebb0
Update db_schema.yaml
murrant Aug 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
163 changes: 89 additions & 74 deletions includes/polling/applications/zfs.inc.php
View file
Open in desktop
@@ -1,17 +1,32 @@
<?php

use LibreNMS\Exceptions\JsonAppMissingKeysException;
use LibreNMS\Exceptions\JsonAppException;
use LibreNMS\RRD\RrdDefinition;

echo ' zfs ';

$name = 'zfs';
$app_id = $app['app_id'];
$options = '-O qv';
$mib = 'NET-SNMP-EXTEND-MIB';
$oid = 'nsExtendOutputFull.3.122.102.115';
$json = snmp_get($device, $oid, $options, $mib);

$zfs=json_decode(stripslashes($json), true);
echo $name;

// Is set to false later if missing keys are found.
$not_legacy=1;

try {
$fetched_zfs=json_app_get($device, $name, 1);
} catch (JsonAppMissingKeysException $e) {
//old version with out the data key
$zfs=$fetched_zfs;
$not_legacy=0;
} catch (JsonAppException $e) {
echo PHP_EOL . $name . ':' .$e->getCode().':'. $e->getMessage() . PHP_EOL;
update_application($app, $e->getCode().':'.$e->getMessage(), []); // Set empty metrics and error message
return;
}

if ($not_legacy == 1) {
$zfs=$fetched_zfs[data];
}

$rrd_name = array('app', $name, $app_id);
$rrd_def = RrdDefinition::make()
Expand Down Expand Up @@ -70,59 +85,59 @@
->addDataset('pre_meta_misses_per', 'GAUGE', 0);

$fields = array(
'deleted' => $zfs{deleted},
'evict_skip' => $zfs{evict_skip},
'mutex_skip' => $zfs{mutex_skip},
'recycle_miss' => $zfs{recycle_miss},
'arc_size' => $zfs{arc_size},
'target_size_max' => $zfs{target_size_max},
'target_size_min' => $zfs{target_size_min},
'target_size' => $zfs{target_size},
'target_size_per' => $zfs{target_size_per},
'arc_size_per' => $zfs{arc_size_per},
'target_size_arat' => $zfs{target_size_arat},
'min_size_per' => $zfs{min_size_per},
'mfu_size' => $zfs{mfu_size},
'p' => $zfs{p},
'rec_used_per' => $zfs{rec_used_per},
'freq_used_per' => $zfs{freq_used_per},
'arc_hits' => $zfs{arc_hits},
'arc_misses' => $zfs{arc_misses},
'demand_data_hits' => $zfs{demand_data_hits},
'demand_data_misses' => $zfs{demand_data_misses},
'demand_meta_hits' => $zfs{demand_meta_hits},
'demand_meta_misses' => $zfs{demand_meta_misses},
'mfu_ghost_hits' => $zfs{mfu_ghost_hits},
'mfu_hits' => $zfs{mfu_hits},
'mru_ghost_hits' => $zfs{mru_ghost_hits},
'mru_hits' => $zfs{mru_hits},
'pre_data_hits' => $zfs{pre_data_hits},
'pre_data_misses' => $zfs{pre_data_misses},
'pre_meta_hits' => $zfs{pre_meta_hits},
'pre_meta_misses' => $zfs{pre_meta_misses},
'anon_hits' => $zfs{anon_hits},
'arc_accesses_total' => $zfs{arc_accesses_total},
'demand_data_total' => $zfs{demand_data_total},
'pre_data_total' => $zfs{pre_data_total},
'real_hits' => $zfs{real_hits},
'cache_hits_per' => $zfs{cache_hits_per},
'cache_miss_per' => $zfs{cache_miss_per},
'actual_hit_per' => $zfs{actual_hit_per},
'data_demand_per' => $zfs{data_demand_per},
'data_pre_per' => $zfs{data_pre_per},
'anon_hits_per' => $zfs{anon_hits_per},
'mru_per' => $zfs{mru_per},
'mfu_per' => $zfs{mfu_per},
'mru_ghost_per' => $zfs{mru_ghost_per},
'mfu_ghost_per' => $zfs{mfu_ghost_per},
'demand_hits_per' => $zfs{demand_hits_per},
'pre_hits_per' => $zfs{pre_hits_per},
'meta_hits_per' => $zfs{meta_hits_per},
'pre_meta_hits_per' => $zfs{pre_meta_hits_per},
'demand_misses_per' => $zfs{demand_misses_per},
'pre_misses_per' => $zfs{pre_misses_per},
'meta_misses_per' => $zfs{meta_misses_per},
'pre_meta_misses_per' => $zfs{pre_meta_misses_per},
'deleted' => $zfs[deleted],
'evict_skip' => $zfs[evict_skip],
'mutex_skip' => $zfs[mutex_skip],
'recycle_miss' => $zfs[recycle_miss],
'arc_size' => $zfs[arc_size],
'target_size_max' => $zfs[target_size_max],
'target_size_min' => $zfs[target_size_min],
'target_size' => $zfs[target_size],
'target_size_per' => $zfs[target_size_per],
'arc_size_per' => $zfs[arc_size_per],
'target_size_arat' => $zfs[target_size_arat],
'min_size_per' => $zfs[min_size_per],
'mfu_size' => $zfs[mfu_size],
'p' => $zfs[p],
'rec_used_per' => $zfs[rec_used_per],
'freq_used_per' => $zfs[freq_used_per],
'arc_hits' => $zfs[arc_hits],
'arc_misses' => $zfs[arc_misses],
'demand_data_hits' => $zfs[demand_data_hits],
'demand_data_misses' => $zfs[demand_data_misses],
'demand_meta_hits' => $zfs[demand_meta_hits],
'demand_meta_misses' => $zfs[demand_meta_misses],
'mfu_ghost_hits' => $zfs[mfu_ghost_hits],
'mfu_hits' => $zfs[mfu_hits],
'mru_ghost_hits' => $zfs[mru_ghost_hits],
'mru_hits' => $zfs[mru_hits],
'pre_data_hits' => $zfs[pre_data_hits],
'pre_data_misses' => $zfs[pre_data_misses],
'pre_meta_hits' => $zfs[pre_meta_hits],
'pre_meta_misses' => $zfs[pre_meta_misses],
'anon_hits' => $zfs[anon_hits],
'arc_accesses_total' => $zfs[arc_accesses_total],
'demand_data_total' => $zfs[demand_data_total],
'pre_data_total' => $zfs[pre_data_total],
'real_hits' => $zfs[real_hits],
'cache_hits_per' => $zfs[cache_hits_per],
'cache_miss_per' => $zfs[cache_miss_per],
'actual_hit_per' => $zfs[actual_hit_per],
'data_demand_per' => $zfs[data_demand_per],
'data_pre_per' => $zfs[data_pre_per],
'anon_hits_per' => $zfs[anon_hits_per],
'mru_per' => $zfs[mru_per],
'mfu_per' => $zfs[mfu_per],
'mru_ghost_per' => $zfs[mru_ghost_per],
'mfu_ghost_per' => $zfs[mfu_ghost_per],
'demand_hits_per' => $zfs[demand_hits_per],
'pre_hits_per' => $zfs[pre_hits_per],
'meta_hits_per' => $zfs[meta_hits_per],
'pre_meta_hits_per' => $zfs[pre_meta_hits_per],
'demand_misses_per' => $zfs[demand_misses_per],
'pre_misses_per' => $zfs[pre_misses_per],
'meta_misses_per' => $zfs[meta_misses_per],
'pre_meta_misses_per' => $zfs[pre_meta_misses_per],
);

$tags = array('name' => $name, 'app_id' => $app_id, 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name);
Expand All @@ -144,18 +159,18 @@

$pools_int=0;
$pools_for_metrics=array(); // used later for replacing pools when inserting into the metrics table
while (isset($zfs{'pools'}{$pools_int})) {
$pools[]=$zfs{'pools'}{$pools_int}{'name'};
$pools_for_mertrics[$zfs{'pools'}{$pools_int}{'name'}]=$zfs{'pools'}{$pools_int}; // copy the pool over later
$rrd_name = array('app', $name, $app_id, $zfs{'pools'}{$pools_int}{'name'});
while (isset($zfs['pools'][$pools_int])) {
$pools[]=$zfs['pools'][$pools_int]['name'];
$pools_for_mertrics[$zfs['pools'][$pools_int]['name']]=$zfs['pools'][$pools_int]; // copy the pool over later
$rrd_name = array('app', $name, $app_id, $zfs['pools'][$pools_int]['name']);
$fields = array(
'size' => $zfs{'pools'}{$pools_int}{'size'},
'alloc' => $zfs{'pools'}{$pools_int}{'alloc'},
'free' => $zfs{'pools'}{$pools_int}{'free'},
'expandsz' => $zfs{'pools'}{$pools_int}{'expandsz'},
'frag' => $zfs{'pools'}{$pools_int}{'frag'},
'cap' => $zfs{'pools'}{$pools_int}{'cap'},
'dedup' => $zfs{'pools'}{$pools_int}{'dedup'},
'size' => $zfs['pools'][$pools_int]['size'],
'alloc' => $zfs['pools'][$pools_int]['alloc'],
'free' => $zfs['pools'][$pools_int]['free'],
'expandsz' => $zfs['pools'][$pools_int]['expandsz'],
'frag' => $zfs['pools'][$pools_int]['frag'],
'cap' => $zfs['pools'][$pools_int]['cap'],
'dedup' => $zfs['pools'][$pools_int]['dedup'],
);
$tags = array('name' => $name, 'app_id' => $app_id, 'rrd_def' => $pool_rrd_def, 'rrd_name' => $rrd_name);
data_update($device, 'app', $tags, $fields);
Expand Down Expand Up @@ -198,6 +213,6 @@
$component->setComponentPrefs($device_id, $zfsc);
}

//replace $zfs{'pools'} with a array where the keys are the pool names and update metrics
$zfs{'pools'}=$pools_for_mertrics;
update_application($app, $json, $zfs);
//replace $zfs['pools'] with a array where the keys are the pool names and update metrics
$zfs['pools']=$pools_for_mertrics;
update_application($app, $fetched_zfs, $zfs);