Commit Graph

846 Commits

Author SHA1 Message Date
Daniel Preussker
975ddbc517 Revert "Fixed php short tags :/" 2016-05-02 20:19:18 +02:00
laf
a14ae0bc18 Fixed php short tags :/ 2016-05-02 18:09:58 +00:00
Aaron Daniels
4545aea28d - Services widget on device overview page was still displaying legacy status
while the database has been storing nagios style status.
  Modified to: 0=Ok, 1=Unknown, 2=Critical.
2016-04-26 07:04:22 +10:00
Neil Lathwood
1c3869c5f0 Merge pull request #3416 from murrant/netonix-poe
Add PoE state to Netonix devices
2016-04-24 20:00:46 +01:00
Tony Murray
b98ba8c1a4 Remove some deprecated functions 2016-04-24 01:05:14 -05:00
Tony Murray
46a0bbfc82 Add PoE state to Netonix devices
Allow for non-numeric states.  state_descr must match what is returned by the device.
2016-04-23 20:56:21 -05:00
Aaron Daniels
111a52d48c Merge branch 'master' into issue-2193 2016-04-12 07:34:40 +10:00
Neil Lathwood
f4073bd01f Merge pull request #3300 from dmelani/toner_width
Make toner overview line up with the rest
2016-03-30 08:26:14 +01:00
Daniel Melani
c2a2927894 Make toner overview line up with the rest 2016-03-29 16:14:53 +02:00
Aaron Daniels
eeb3dff393 - Use Nagios alerting: 0 = Ok, 1 = Warning, 2 = Critical
- Update documentation
- Moved SQL for upstream changes
2016-03-29 20:15:42 +10:00
Paul Heinrichs
a13d148fb1 Added Signal Sensor 2016-03-22 10:37:07 -04:00
Aaron Daniels
854812a457 - added rrd_pipes to check script
- renamed service_* to *_service
2016-03-22 16:40:51 +10:00
Aaron Daniels
3e1d40fd7c - Added $vars to ajax_forms
- replaced all instances of $_POST with $vars
2016-03-16 08:37:15 +10:00
Aaron Daniels
0d6cfec589 Nagios Services
- Moved check-services.php to a poller module
    - Added performance data collection to the poller
    - Centralised DB functions to includes/services.inc.php
    - Created add/edit/delete functions off the device, services page
    - Removed legacy edit/delete interfaces.
    - Moved and modified check.inc scripts
    - Documentation Updates
    - Modified services table
2016-03-15 22:23:14 +10:00
Neil Lathwood
56caedbaff Merge pull request #3188 from geordish/issue-1674
Corrected inserting ' into overide syslocation string
2016-03-08 20:54:35 +00:00
David Bell
a33d16dafa Corrected inserting ' into overide syslocation string 2016-03-08 11:18:33 +00:00
David Bell
d2db4a4af2 Corrected aggregate graph on smokeping page 2016-03-07 11:40:47 +00:00
Richard
6f61ec37d5 Updated Apps layout to use panels 2016-02-29 13:23:42 +00:00
Rosiak
eff7e18d4e Align tables
Something that bugged me for a while..
2016-02-28 02:29:51 +01:00
Rosiak
74db415404 Fixup 2016-02-28 01:27:23 +01:00
Rosiak
f298ccb30f Scrut fix 2016-02-27 19:12:13 +01:00
Rosiak
6923a32dbd A few things
ucwords = happy ocd

Basic state page

Allign order = happy ocd
2016-02-27 02:35:28 +01:00
Rosiak
ebe9154934 Added more sensors 2016-02-27 01:56:50 +01:00
Rosiak
928fd70ced Proper State Monitoring 2016-02-26 23:40:34 +01:00
Neil Lathwood
7f21325e9f Merge pull request #3093 from murrant/php_fixes
Fix a few php errors for syslog, and everywhere else.
2016-02-26 13:26:28 +00:00
Tony Murray
9f22b18dc8 Split is removed in PHP7, replace with explode as none were using it as a regex.
Also fix two array keys without quotes in include/syslog.php
Fixes #2205
2016-02-25 14:34:06 -06:00
Harm van Tilborg
09f03c0e52 Adapted device edit form to include larger purpose field 2016-02-24 13:36:42 +01:00
Neil Lathwood
fa8027b525 Merge pull request #3065 from adaniels21487/issue-3038
CBQoS not displaying policies
2016-02-23 10:58:50 +00:00
Aaron Daniels
f18fa9e455 - Pre-Init the $options array.
In some scenarios $options was already set with a previous filter.
- Remove RRD file checking, test for existance of components instead.
2016-02-23 17:16:51 +10:00
Daniel Preussker
731e43bc66 Revert "[WIP] Sanity!" 2016-02-17 13:59:58 +00:00
Neil Lathwood
633ac101eb Merge pull request #2979 from f0o/sanity
[WIP] Sanity!
2016-02-16 21:44:10 +00:00
Tony Murray
f824fd123e Always define $config_total. Default is 1. 2016-02-12 14:44:32 -06:00
Tony Murray
564146dc8c Fix inverted diff. 2016-02-12 14:40:04 -06:00
Tony Murray
31897758e5 Restore $config['oxidized']['features']['versioning']. 2016-02-12 14:27:55 -06:00
Tony Murray
cc344bf3c3 Use Oxidized's built in diffing capability. Drops the need for xdiff and one http call. 2016-02-12 14:21:55 -06:00
Tony Murray
28216f67b0 Merge branch 'master' into config_diff 2016-02-12 10:36:18 -06:00
Tony Murray
aa9d4798dc Remove $config['oxidized']['features']['versioning']. I did not update the schema to remove the entry from the config table.
Update the documentation a bit.

Issue #2812
2016-02-12 10:23:49 -06:00
laf
6b7030c082 Added show/hide line numbers button to show config page 2016-02-11 23:19:56 +00:00
Tony Murray
9a2d22df0a Remove array_column() use, it requires php 5.5 2016-02-10 19:24:13 -06:00
Tony Murray
0e8ea8b6b2 Mark displayed diffs. 2016-02-10 17:16:59 -06:00
Tony Murray
b5106f4e17 Generate and display diffs between versions. Clicking show diff generates a diff between the shown version and the selected version. 2016-02-10 14:51:40 -06:00
Neil Lathwood
fa783dc07e Merge pull request #2841 from adaniels21487/issue-2665
Cisco OTV
2016-02-10 19:49:59 +00:00
f0o
c767a26732 more bulk sanity 2016-02-10 16:02:13 +00:00
Neil Lathwood
29f3dac9be Merge pull request #2972 from murrant/issue-2883
Deal with 0 value for sensor data better.
2016-02-09 21:11:26 +00:00
Tony Murray
e3ec42c06d Deal with 0 value for sensor data better.
Issue #2883
2016-02-09 14:20:36 -06:00
Neil Lathwood
3704ff2c67 Merge pull request #2964 from ohrensessel/correct-quotes
Fix usage of single quotes, double quotes needed
2016-02-09 20:10:51 +00:00
Neil Lathwood
5f0c150d42 Merge pull request #2946 from murrant/oxidized_group_versions
Fix oxidized versioning + groups
2016-02-09 19:25:22 +00:00
ohrensessel
b016763007 Fix usage of single quotes, double quotes needed 2016-02-09 13:27:10 +01:00
Tony Murray
89f596fdbb Fix oxidized versioning + groups
Consilidate config fetching rather than having two fetches with the first always failing when the device has a group.
2016-02-05 15:23:05 -06:00
Mark Schouten
be225148ca There was one more include that screwed up the Ceph graphs 2016-02-05 14:50:27 +01:00