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
9,971 Commits 47 Branches 151 Tags
d82ca08bc2bb950febec8fc9ccdbdd0c36d69cb3
Commit Graph
3697 Commits
Author SHA1 Message Date
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
Daniel Preussker e064d7ddff Merge pull request #2988 from laf/issue-2947 
Added show/hide line numbers button to show config page
 2016-02-12 08:12:41 +00:00
laf 6b7030c082 Added show/hide line numbers button to show config page 2016-02-11 23:19:56 +00:00
laf 4aaf4d8a7b Added missing from email settings field 2016-02-11 22:11:07 +00:00
Neil Lathwood a9e81c2bfb Merge pull request #2955 from arjitc/patch-24 
Merge launch, SSH, telnet and settings into 1 dropdown
 2016-02-11 21:43:26 +00:00
Tony Murray 3eddfd46bd Import GeSHi diff type. 2016-02-10 19:31:31 -06: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
Neil Lathwood 9cca64de4c Merge pull request #2961 from pblasquez/pblasquez-application_json_patch 
Missed one file for application/json headers
 2016-02-10 21:27:52 +00:00
pblasquez c53e4de20c Update ajax_setresolution.php 2016-02-10 13:22:22 -08: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
Daniel Preussker 2b55c06d9e Revert "Variable/Environment sanity" 2016-02-10 14:31:16 +00:00
f0o 8d9b522bdb Remove redundant calls 2016-02-10 13:54:22 +00:00
f0o a6bca987bf Enforce sanity before returning from database 2016-02-10 13:52:43 +00:00
f0o 37dccb3932 First effort in bringing some sanity 2016-02-10 13:42:55 +00:00
Tony Murray 8849cee3f4 Missed this while fixing sensor data with 0 values. 2016-02-09 15:42:46 -06: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 758facd4bf Merge pull request #2958 from murrant/calix 
Calix Support
 2016-02-09 20:06:27 +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
pblasquez 2a98a2825f Update ajax_setresolution.php 2016-02-08 16:29:53 -08:00
Tony Murray f177dd6608 Merge branch 'master' into calix 2016-02-08 14:20:14 -06:00
Arjit Chaudhary 9cd0820445 use bootstraps own pull-right so that the dropdown draws inside the page width 2016-02-08 22:55:18 +05:30
Arjit Chaudhary 729a0d6a62 Merge launch, SSH, telnet and settings into 1 dropdown 
Screenshot: http://i.imgur.com/vV30EKQ.png
 2016-02-08 22:51:09 +05:30
Daniel Preussker b0bc7b778a Typo 2016-02-07 15:40:00 +00:00
Daniel Preussker f940c0c888 Fix IP Display 2016-02-07 15:39:17 +00:00
Daniel Preussker a7f1a987f5 Merge pull request #2917 from laf/issue-2885 
Updated parsing of alert rules to allow |
 2016-02-07 14:31:14 +00: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
Tony Murray 4aa9838eda add discover, polling and mibs. 
work around empty ifDesc
 2016-02-05 14:26:06 -06:00
Mark Schouten be225148ca There was one more include that screwed up the Ceph graphs 2016-02-05 14:50:27 +01:00
pblasquez e8f773b010 Update ajax_form.php 2016-02-04 18:23:49 -08:00
pblasquez 1b4dfd2fc6 Update ajax_rulesuggest.php 2016-02-04 18:18:40 -08:00
pblasquez d62ad2eb02 Update ajax_search.php 2016-02-04 18:16:36 -08:00
pblasquez ab6a608bdb Update ajax_table.php 2016-02-04 18:09:47 -08:00
pblasquez e397860257 Update ajax_dash.php 2016-02-04 18:09:09 -08:00
laf 350345b611 Updated parsing of alert rules to allow | 2016-02-03 07:52:35 +00:00
Neil Lathwood 0602c6a3ed Merge pull request #2915 from adaniels21487/issue-2914 
BGP Pages call overlib directly not honouring $config['web_mouseover']
 2016-02-02 22:06:57 +00:00
Aaron Daniels 4ebc2b1f33 - Modified code to use graph generation functions instead of calling overlib directly. 
The graph generation functions check for the status of 'web_mouseover'.
 2016-02-03 06:41:20 +10:00
Mark Schouten 4150b86205 Make ceph.inc.php compatible with the new graph_array-method, which gets reset after each include. 2016-02-02 11:05:59 +01:00
Mike Rostermund ac572e1558 Sort sensors by OID to more logically group sensors on device overview 2016-01-30 23:02:09 +01:00
Rosiak d29d84a67f Adjust Leaflet GreenCluster color 2016-01-30 20:03:26 +01:00
Neil Lathwood b72c1282d9 Merge pull request #2797 from BarbarossaTM/issue-386-v2 
Ability to use ifIndex,ifName and ifDescr to create and update port rrd files
 2016-01-29 13:05:03 +00:00