Skip to content

Commit e70c601

Browse files
slashdoomslashdoom
authored
Add FreeRADIUS App Key Checks (librenms#18399)
* Update freeradius.inc.php * Update freeradius.inc.php * lint * lint * Update freeradius.inc.php * Update freeradius.inc.php * Update freeradius.inc.php
1 parent 7fa9bcc commit e70c601

File tree

1 file changed

+49
-49
lines changed

1 file changed

+49
-49
lines changed

‎includes/polling/applications/freeradius.inc.php‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
$rawdata = snmp_get($device, $oid, $options);
1313
}
1414

15-
//Format Data
15+
// Format Data
1616
$lines = explode("\n", $rawdata);
1717
$freeradius = [];
1818
$metrics = [];
@@ -21,17 +21,17 @@
2121
$freeradius[$var] = $value;
2222
}
2323

24-
//FreeRADIUS-Total-Access
24+
// FreeRADIUS-Total-Access
2525
$rrd_def = RrdDefinition::make()
2626
->addDataset('requests', 'DERIVE', 0, 125000000000)
2727
->addDataset('accepts', 'DERIVE', 0, 125000000000)
2828
->addDataset('rejects', 'DERIVE', 0, 125000000000)
2929
->addDataset('challenges', 'DERIVE', 0, 125000000000);
3030
$fields = [
31-
'requests' => $freeradius['FreeRADIUS-Total-Access-Requests'],
32-
'accepts' => $freeradius['FreeRADIUS-Total-Access-Accepts'],
33-
'rejects' => $freeradius['FreeRADIUS-Total-Access-Rejects'],
34-
'challenges' => $freeradius['FreeRADIUS-Total-Access-Challenges'],
31+
'requests' => $freeradius['FreeRADIUS-Total-Access-Requests'] ?? null,
32+
'accepts' => $freeradius['FreeRADIUS-Total-Access-Accepts'] ?? null,
33+
'rejects' => $freeradius['FreeRADIUS-Total-Access-Rejects'] ?? null,
34+
'challenges' => $freeradius['FreeRADIUS-Total-Access-Challenges'] ?? null,
3535
];
3636
$metrics['access'] = $fields;
3737
$tags = [
@@ -43,7 +43,7 @@
4343
];
4444
app('Datastore')->put($device, 'app', $tags, $fields);
4545

46-
//FreeRADIUS-Total-Auth
46+
// FreeRADIUS-Total-Auth
4747
$rrd_def = RrdDefinition::make()
4848
->addDataset('responses', 'DERIVE', 0, 125000000000)
4949
->addDataset('duplicate_requests', 'DERIVE', 0, 125000000000)
@@ -52,12 +52,12 @@
5252
->addDataset('dropped_requests', 'DERIVE', 0, 125000000000)
5353
->addDataset('unknown_types', 'DERIVE', 0, 125000000000);
5454
$fields = [
55-
'responses' => $freeradius['FreeRADIUS-Total-Auth-Responses'],
56-
'duplicate_requests' => $freeradius['FreeRADIUS-Total-Auth-Duplicate-Requests'],
57-
'malformed_requests' => $freeradius['FreeRADIUS-Total-Auth-Malformed-Requests'],
58-
'invalid_requests' => $freeradius['FreeRADIUS-Total-Auth-Invalid-Requests'],
59-
'dropped_requests' => $freeradius['FreeRADIUS-Total-Auth-Dropped-Requests'],
60-
'unknown_types' => $freeradius['FreeRADIUS-Total-Auth-Unknown-Types'],
55+
'responses' => $freeradius['FreeRADIUS-Total-Auth-Responses'] ?? null,
56+
'duplicate_requests' => $freeradius['FreeRADIUS-Total-Auth-Duplicate-Requests'] ?? null,
57+
'malformed_requests' => $freeradius['FreeRADIUS-Total-Auth-Malformed-Requests'] ?? null,
58+
'invalid_requests' => $freeradius['FreeRADIUS-Total-Auth-Invalid-Requests'] ?? null,
59+
'dropped_requests' => $freeradius['FreeRADIUS-Total-Auth-Dropped-Requests'] ?? null,
60+
'unknown_types' => $freeradius['FreeRADIUS-Total-Auth-Unknown-Types'] ?? null,
6161
];
6262
$metrics['auth'] = $fields;
6363
$tags = [
@@ -69,7 +69,7 @@
6969
];
7070
app('Datastore')->put($device, 'app', $tags, $fields);
7171

72-
//FreeRADIUS-Total-Acct
72+
// FreeRADIUS-Total-Acct
7373
$rrd_def = RrdDefinition::make()
7474
->addDataset('requests', 'DERIVE', 0, 125000000000)
7575
->addDataset('responses', 'DERIVE', 0, 125000000000)
@@ -79,13 +79,13 @@
7979
->addDataset('dropped_requests', 'DERIVE', 0, 125000000000)
8080
->addDataset('unknown_types', 'DERIVE', 0, 125000000000);
8181
$fields = [
82-
'requests' => $freeradius['FreeRADIUS-Total-Accounting-Requests'],
83-
'responses' => $freeradius['FreeRADIUS-Total-Accounting-Responses'],
84-
'duplicate_requests' => $freeradius['FreeRADIUS-Total-Acct-Duplicate-Requests'],
85-
'malformed_requests' => $freeradius['FreeRADIUS-Total-Acct-Malformed-Requests'],
86-
'invalid_requests' => $freeradius['FreeRADIUS-Total-Acct-Invalid-Requests'],
87-
'dropped_requests' => $freeradius['FreeRADIUS-Total-Acct-Dropped-Requests'],
88-
'unknown_types' => $freeradius['FreeRADIUS-Total-Acct-Unknown-Types'],
82+
'requests' => $freeradius['FreeRADIUS-Total-Accounting-Requests'] ?? null,
83+
'responses' => $freeradius['FreeRADIUS-Total-Accounting-Responses'] ?? null,
84+
'duplicate_requests' => $freeradius['FreeRADIUS-Total-Acct-Duplicate-Requests'] ?? null,
85+
'malformed_requests' => $freeradius['FreeRADIUS-Total-Acct-Malformed-Requests'] ?? null,
86+
'invalid_requests' => $freeradius['FreeRADIUS-Total-Acct-Invalid-Requests'] ?? null,
87+
'dropped_requests' => $freeradius['FreeRADIUS-Total-Acct-Dropped-Requests'] ?? null,
88+
'unknown_types' => $freeradius['FreeRADIUS-Total-Acct-Unknown-Types'] ?? null,
8989
];
9090
$metrics['acct'] = $fields;
9191
$tags = [
@@ -97,17 +97,17 @@
9797
];
9898
app('Datastore')->put($device, 'app', $tags, $fields);
9999

100-
//FreeRADIUS-Total-Proxy-Access
100+
// FreeRADIUS-Total-Proxy-Access
101101
$rrd_def = RrdDefinition::make()
102102
->addDataset('requests', 'DERIVE', 0, 125000000000)
103103
->addDataset('accepts', 'DERIVE', 0, 125000000000)
104104
->addDataset('rejects', 'DERIVE', 0, 125000000000)
105105
->addDataset('challenges', 'DERIVE', 0, 125000000000);
106106
$fields = [
107-
'requests' => $freeradius['FreeRADIUS-Total-Proxy-Access-Requests'],
108-
'accepts' => $freeradius['FreeRADIUS-Total-Proxy-Access-Accepts'],
109-
'rejects' => $freeradius['FreeRADIUS-Total-Proxy-Access-Rejects'],
110-
'challenges' => $freeradius['FreeRADIUS-Total-Proxy-Access-Challenges'],
107+
'requests' => $freeradius['FreeRADIUS-Total-Proxy-Access-Requests'] ?? null,
108+
'accepts' => $freeradius['FreeRADIUS-Total-Proxy-Access-Accepts'] ?? null,
109+
'rejects' => $freeradius['FreeRADIUS-Total-Proxy-Access-Rejects'] ?? null,
110+
'challenges' => $freeradius['FreeRADIUS-Total-Proxy-Access-Challenges'] ?? null,
111111
];
112112
$metrics['proxy_access'] = $fields;
113113
$tags = [
@@ -119,7 +119,7 @@
119119
];
120120
app('Datastore')->put($device, 'app', $tags, $fields);
121121

122-
//FreeRADIUS-Total-Proxy-Auth
122+
// FreeRADIUS-Total-Proxy-Auth
123123
$rrd_def = RrdDefinition::make()
124124
->addDataset('responses', 'DERIVE', 0, 125000000000)
125125
->addDataset('duplicate_requests', 'DERIVE', 0, 125000000000)
@@ -128,12 +128,12 @@
128128
->addDataset('dropped_requests', 'DERIVE', 0, 125000000000)
129129
->addDataset('unknown_types', 'DERIVE', 0, 125000000000);
130130
$fields = [
131-
'responses' => $freeradius['FreeRADIUS-Total-Proxy-Auth-Responses'],
132-
'duplicate_requests' => $freeradius['FreeRADIUS-Total-Proxy-Auth-Duplicate-Requests'],
133-
'malformed_requests' => $freeradius['FreeRADIUS-Total-Proxy-Auth-Malformed-Requests'],
134-
'invalid_requests' => $freeradius['FreeRADIUS-Total-Proxy-Auth-Invalid-Requests'],
135-
'dropped_requests' => $freeradius['FreeRADIUS-Total-Proxy-Auth-Dropped-Requests'],
136-
'unknown_types' => $freeradius['FreeRADIUS-Total-Proxy-Auth-Unknown-Types'],
131+
'responses' => $freeradius['FreeRADIUS-Total-Proxy-Auth-Responses'] ?? null,
132+
'duplicate_requests' => $freeradius['FreeRADIUS-Total-Proxy-Auth-Duplicate-Requests'] ?? null,
133+
'malformed_requests' => $freeradius['FreeRADIUS-Total-Proxy-Auth-Malformed-Requests'] ?? null,
134+
'invalid_requests' => $freeradius['FreeRADIUS-Total-Proxy-Auth-Invalid-Requests'] ?? null,
135+
'dropped_requests' => $freeradius['FreeRADIUS-Total-Proxy-Auth-Dropped-Requests'] ?? null,
136+
'unknown_types' => $freeradius['FreeRADIUS-Total-Proxy-Auth-Unknown-Types'] ?? null,
137137
];
138138
$metrics['proxy_auth'] = $fields;
139139
$tags = [
@@ -145,7 +145,7 @@
145145
];
146146
app('Datastore')->put($device, 'app', $tags, $fields);
147147

148-
//FreeRADIUS-Total-Proxy-Acct
148+
// FreeRADIUS-Total-Proxy-Acct
149149
$rrd_def = RrdDefinition::make()
150150
->addDataset('requests', 'DERIVE', 0, 125000000000)
151151
->addDataset('responses', 'DERIVE', 0, 125000000000)
@@ -155,13 +155,13 @@
155155
->addDataset('dropped_requests', 'DERIVE', 0, 125000000000)
156156
->addDataset('unknown_types', 'DERIVE', 0, 125000000000);
157157
$fields = [
158-
'requests' => $freeradius['FreeRADIUS-Total-Proxy-Accounting-Requests'],
159-
'responses' => $freeradius['FreeRADIUS-Total-Proxy-Accounting-Responses'],
160-
'duplicate_requests' => $freeradius['FreeRADIUS-Total-Proxy-Acct-Duplicate-Requests'],
161-
'malformed_requests' => $freeradius['FreeRADIUS-Total-Proxy-Acct-Malformed-Requests'],
162-
'invalid_requests' => $freeradius['FreeRADIUS-Total-Proxy-Acct-Invalid-Requests'],
163-
'dropped_requests' => $freeradius['FreeRADIUS-Total-Proxy-Acct-Dropped-Requests'],
164-
'unknown_types' => $freeradius['FreeRADIUS-Total-Proxy-Acct-Unknown-Types'],
158+
'requests' => $freeradius['FreeRADIUS-Total-Proxy-Accounting-Requests'] ?? null,
159+
'responses' => $freeradius['FreeRADIUS-Total-Proxy-Accounting-Responses'] ?? null,
160+
'duplicate_requests' => $freeradius['FreeRADIUS-Total-Proxy-Acct-Duplicate-Requests'] ?? null,
161+
'malformed_requests' => $freeradius['FreeRADIUS-Total-Proxy-Acct-Malformed-Requests'] ?? null,
162+
'invalid_requests' => $freeradius['FreeRADIUS-Total-Proxy-Acct-Invalid-Requests'] ?? null,
163+
'dropped_requests' => $freeradius['FreeRADIUS-Total-Proxy-Acct-Dropped-Requests'] ?? null,
164+
'unknown_types' => $freeradius['FreeRADIUS-Total-Proxy-Acct-Unknown-Types'] ?? null,
165165
];
166166
$metrics['proxy_acct'] = $fields;
167167
$tags = [
@@ -173,7 +173,7 @@
173173
];
174174
app('Datastore')->put($device, 'app', $tags, $fields);
175175

176-
//FreeRADIUS-Queue
176+
// FreeRADIUS-Queue
177177
$rrd_name = ['app', $name, 'queue', $app->app_id];
178178
$rrd_def = RrdDefinition::make()
179179
->addDataset('len_internal', 'DERIVE', 0, 125000000000)
@@ -184,13 +184,13 @@
184184
->addDataset('pps_in', 'DERIVE', 0, 125000000000)
185185
->addDataset('pps_out', 'DERIVE', 0, 125000000000);
186186
$fields = [
187-
'len_internal' => $freeradius['FreeRADIUS-Queue-Len-Internal'],
188-
'len_proxy' => $freeradius['FreeRADIUS-Queue-Len-Proxy'],
189-
'len_auth' => $freeradius['FreeRADIUS-Queue-Len-Auth'],
190-
'len_acct' => $freeradius['FreeRADIUS-Queue-Len-Acct'],
191-
'len_detail' => $freeradius['FreeRADIUS-Queue-Len-Detail'],
192-
'pps_in' => $freeradius['FreeRADIUS-Queue-PPS-In'],
193-
'pps_out' => $freeradius['FreeRADIUS-Queue-PPS-Out'],
187+
'len_internal' => $freeradius['FreeRADIUS-Queue-Len-Internal'] ?? null,
188+
'len_proxy' => $freeradius['FreeRADIUS-Queue-Len-Proxy'] ?? null,
189+
'len_auth' => $freeradius['FreeRADIUS-Queue-Len-Auth'] ?? null,
190+
'len_acct' => $freeradius['FreeRADIUS-Queue-Len-Acct'] ?? null,
191+
'len_detail' => $freeradius['FreeRADIUS-Queue-Len-Detail'] ?? null,
192+
'pps_in' => $freeradius['FreeRADIUS-Queue-PPS-In'] ?? null,
193+
'pps_out' => $freeradius['FreeRADIUS-Queue-PPS-Out'] ?? null,
194194
];
195195
$metrics['queue'] = $fields;
196196
$tags = [

0 commit comments

Comments
 (0)