Commit Graph

41 Commits

Author SHA1 Message Date
Tony Murray
f3ba8947f7 Use Config helper (#10339)
remove usage of global variable
2019-06-23 00:29:12 -05:00
Tony Murray
cb005210d2 Resubmit #9608 (#9941)
* Reorganize trap tests

* Testing db DRIVER to prevent .env from interfering

* New code to detect if Laravel is booted.  Hopefully more reliable.

* WIP external test process

* revert module test helper

* Use .env in Eloquent::boot()

* Fix test database settings loading

* fix undefined classes
(didn't find the one I needed)

* Fix incorrect Config usages
And RrdDefinition return type

* fix .env loading

* use the right DB

* slightly more accurate isConnected

* Move db_name to DBSetupTest specifically

* restore $_SERVER in AuthSSOTest

* missed item

* WIP

* tear down in the correct order.

* some testing cleanups

* remove check for duplicate event listener, it's not working right

* Don't need this change anymore

* Implement Log::event to replace legacy function log_event()

* fix port tests

* fix up tests

* remove pointless TrapTestCase class

* fix style

* Fix db config not being merged...

* skip env check for tests

* defer database operations until after Laravel is booted.

* don't include dbFaciale...

* redundant use
2019-03-12 23:59:03 -05:00
Tony Murray
eb648a1d6f Revert "Changes to improve testing (#9608)" (#9937)
This reverts commit d1a0ccda46.
2019-03-12 00:49:14 -05:00
Tony Murray
d1a0ccda46 Changes to improve testing (#9608)
* Reorganize trap tests

* Testing db DRIVER to prevent .env from interfering

* New code to detect if Laravel is booted.  Hopefully more reliable.

* WIP external test process

* revert module test helper

* Use .env in Eloquent::boot()

* Fix test database settings loading

* fix undefined classes
(didn't find the one I needed)

* Fix incorrect Config usages
And RrdDefinition return type

* fix .env loading

* use the right DB

* slightly more accurate isConnected

* Move db_name to DBSetupTest specifically

* restore $_SERVER in AuthSSOTest

* missed item

* WIP

* tear down in the correct order.

* some testing cleanups

* remove check for duplicate event listener, it's not working right

* Don't need this change anymore

* Implement Log::event to replace legacy function log_event()

* fix port tests

* fix up tests

* remove pointless TrapTestCase class

* fix style
2019-03-11 22:59:39 -05:00
Tony Murray
fad0bffc43 Escape SNMP & IPMI shell commands (#9537)
hopefully doesn't break anything
Mostly issues with snmp oids and options containing spaces.  Try to remove all of those.

DO NOT DELETE THIS TEXT

#### Please note

> Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting.

- [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/)

#### Testers

If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926`
After you are done testing, you can remove the changes with `./scripts/github-remove`.  If there are schema changes, you can ask on discord how to revert.
2018-12-16 13:42:50 +00:00
Tony Murray
58afe78ce4 fix ipmi sensors sending the wrong tags to influxdb (#7906) 2017-12-12 20:28:30 -06:00
Simon Mott
6c6499c2fe fix: Don't run ipmitool without knowing a type (#6504) 2017-04-25 21:36:52 +01:00
Neil Lathwood
fad5aca1b7 feature: Allow customisation of rrd step/heartbeat when creating new rrd files (#5947)
* feature: Allow customisation of rrd step/heartbeat when creating new rrd files

* revert defaults

* added docs + webui config option

* Move RrdDefinition to an Object to make them easier to create and remove the possibility of typos.

* Fix style/lint issues and missing use statements

* 3 more missing use statements

* updated doc + moved schema file
2017-02-23 22:45:50 +00:00
Svennd
5733fb27fa fix: Fixed system temperature from ipmi descr including a space at the end
based on @laf's help, this issue was resolved.
2017-02-03 12:49:22 +00:00
Neil Lathwood
d86b39395a refactor: Small poller improvements, removes unecessary queries / execs (#4741) 2016-10-14 20:03:26 -05:00
Zaxmy
0a30502fea fix: ipmi poller, run with USER rights and surround username and password with '' #4710 2016-10-04 08:13:52 +01:00
Tony Murray
9284bc60ff Update code in includes to be PSR-2 compliant (#4220)
refactor: Update code in /includes to be psr2 compliant #4220
2016-08-28 18:32:58 +01:00
Tony Murray
1f5cfe283e Merge remote-tracking branch 'upstream/master' into rrd-create-remote 2016-07-18 15:58:56 -05:00
laf
2530173aac Added d_echo() to ipmi poller 2016-07-09 17:43:21 +01:00
Tony Murray
01cfb960d1 Fix sensors rrd name issue
Use last instead of first, as last won't flush rrdcached
Only stream_select if timeout > 0
Attempt to fix mysql
2016-07-08 22:58:36 -05:00
Tony Murray
57650e4ffc Remove nfs requirement for distributed poller (with rrdtool 1.5+)
Use data_update instead of rrd_update/rrd_create and influx_update
Centralize rrd file check so we can check against a remote rrdcached server too
Use rrd_name() to generate rrd file names
2016-07-07 21:10:06 -05:00
laf
0f33f6d1fa Rebased 2016-01-04 12:09:32 +00:00
laf
8953e268f8 Added NOW() to dbUpdate calls to sensors 2015-12-09 22:24:29 +00:00
laf
7b14aada4e Rebased 2015-10-26 11:08:19 +00:00
f0o
7d95e94954 Fix rrd creation parameters 2015-09-28 08:24:57 +00:00
laf
433562d351 More updates for influx 2015-08-19 20:58:02 +00:00
laf
987634e463 Updated rrdtool_update() to use new array format 2015-08-18 16:26:55 +00:00
Job Snijders
d8693f05ae Fix coding style part 2 2015-07-15 11:04:22 +02:00
Rudy Hardeman
41ad518c25 Initial IPMI type detect version 2015-05-13 08:33:48 +02:00
Alexander Sosna
5a7988e2e4 chmod 0644 to php files not directly executed 2015-04-28 22:58:03 +02:00
Adam Amstrong
b273e04241 /// -> //
git-svn-id: http://www.observium.org/svn/observer/trunk@3240 61d68cd4-352d-0410-923a-c4978735b2b8
2012-05-25 12:24:34 +00:00
Adam Amstrong
cacf913a55 # -> / for phpdoc
git-svn-id: http://www.observium.org/svn/observer/trunk@3239 61d68cd4-352d-0410-923a-c4978735b2b8
2012-05-25 11:29:53 +00:00
Tom Laermans
f2be2f33d2 add agent sensor capacity, hddtemp script in agent-local as demo, possibly needs a little more work
git-svn-id: http://www.observium.org/svn/observer/trunk@3213 61d68cd4-352d-0410-923a-c4978735b2b8
2012-05-20 18:23:40 +00:00
Adam Amstrong
2b8178bb5b move all RRA decisions to config. switch mempool/storage to new rrds (sorry, data lost, the old rrds sucked). added some more apps pages.
git-svn-id: http://www.observium.org/svn/observer/trunk@3068 61d68cd4-352d-0410-923a-c4978735b2b8
2012-04-20 17:37:58 +00:00
Tom Laermans
0417fe1948 call ipmitool locally when polling the observium host itself, solves some issues with a shared IPMI on the observium host box NIC
git-svn-id: http://www.observium.org/svn/observer/trunk@2685 61d68cd4-352d-0410-923a-c4978735b2b8
2011-10-13 16:16:24 +00:00
Tom Laermans
3558ea53a0 restore 2516 dbFacile.php, apparently the code layout changes breaking something somewhere?
git-svn-id: http://www.observium.org/svn/observer/trunk@2525 61d68cd4-352d-0410-923a-c4978735b2b8
2011-09-20 15:59:51 +00:00
Tom Laermans
d864ce234f kill a whole bunch of trailing spaces
git-svn-id: http://www.observium.org/svn/observer/trunk@2516 61d68cd4-352d-0410-923a-c4978735b2b8
2011-09-20 09:55:11 +00:00
Adam Amstrong
66b34b8999 more db* (and add on-the-fly discovery of ports and removal of OSPF areas)
git-svn-id: http://www.observium.org/svn/observer/trunk@2338 61d68cd4-352d-0410-923a-c4978735b2b8
2011-05-16 21:56:01 +00:00
Tom Laermans
8c840da62d moved ipmi_unit variable to config variable, patch by lenwe
git-svn-id: http://www.observium.org/svn/observer/trunk@2271 61d68cd4-352d-0410-923a-c4978735b2b8
2011-05-09 08:18:30 +00:00
Tom Laermans
a319f92b3c fix ipmi sensor rrds
git-svn-id: http://www.observium.org/svn/observer/trunk@2184 61d68cd4-352d-0410-923a-c4978735b2b8
2011-04-27 16:05:41 +00:00
Tom Laermans
f55a30f744 some formatting cleanups, introduce some more FIXMEs to look at, plus replace mysql_fetch_array by mysql_fetch_assoc, for great justice
git-svn-id: http://www.observium.org/svn/observer/trunk@2029 61d68cd4-352d-0410-923a-c4978735b2b8
2011-04-06 13:54:50 +00:00
Tom Laermans
ecbcd1db43 clean up polling source files, remove dead code
git-svn-id: http://www.observium.org/svn/observer/trunk@1865 61d68cd4-352d-0410-923a-c4978735b2b8
2011-03-16 01:11:27 +00:00
Tom Laermans
0a24da6945 make ipmitool path configurable
git-svn-id: http://www.observium.org/svn/observer/trunk@1768 61d68cd4-352d-0410-923a-c4978735b2b8
2010-12-20 21:20:47 +00:00
Tom Laermans
6f4e5b5170 Show unit on IPMI poll, minor fix to CHANGELOG
git-svn-id: http://www.observium.org/svn/observer/trunk@1765 61d68cd4-352d-0410-923a-c4978735b2b8
2010-12-16 11:25:02 +00:00
Tom Laermans
6f22e40042 allow negative values in ipmi sensor files, for negative volts and temperatures
git-svn-id: http://www.observium.org/svn/observer/trunk@1761 61d68cd4-352d-0410-923a-c4978735b2b8
2010-12-16 10:24:24 +00:00
Tom Laermans
06d2a707d5 some sensor unification, rename sensor rrds and rename the DS, add testing IPMI support (no web-part yet) - tested against Intel RMM3 and working. some further cleanups as well.
git-svn-id: http://www.observium.org/svn/observer/trunk@1758 61d68cd4-352d-0410-923a-c4978735b2b8
2010-12-15 17:54:42 +00:00