tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,030 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

11030 Commits

Author SHA1 Message Date
m-lopez-f 53e0436eff Fixed problems with snmp3 search. Tiquet: #2830 
(cherry picked from commit 670c30975d)
 2016-01-20 13:02:52 +01:00
m-lopez-f cfe42ab9d3 Fixed error in sql charge data in instalation. Tiquet: #2899 
(cherry picked from commit 6317ff1312)
 2016-01-20 13:02:13 +01:00
m-lopez-f 5e4b9c4b45 Fixed search in alert templates, when DB is Oracle. Tiquet: #3231 
(cherry picked from commit 053d0298a1)
 2016-01-20 13:01:46 +01:00
Junichi Satoh 65b709f954 Updated pandora_agent.conf for FreeBSD. 2016-01-20 09:45:18 +09:00
artica 4e35b4d01f Auto-updated build strings. 2016-01-20 00:01:34 +01:00
mdtrooper 8881725c85 Fixed the updating the version when you upload a offline package into update manager. 
(cherry picked from commit 6a08273f24)
 2016-01-19 14:43:51 +01:00
pandora-release 98a2b65f80 Updated version and build strings. 2016-01-19 12:30:03 +01:00
Junichi Satoh 26d2f4613f Added check for php filter extension. 
(cherry picked from commit 4b8097a004)
 2016-01-19 19:41:31 +09:00
Adam Bishop 3e01577c16 Make the installer work when an existing database is selected 
(cherry picked from commit 26d12073cb)
 2016-01-19 10:04:59 +01:00
mdtrooper eb0be37d09 Move the lost dashboard contansts to the constants.php file. 
(cherry picked from commit 12a7e211f24ec8d41bfbddf473f913d8d4095625)

Conflicts:
	pandora_console/include/constants.php
 2016-01-19 09:29:30 +01:00
artica 78b2902585 Auto-updated build strings. 2016-01-19 00:01:24 +01:00
pandora-release 528f001984 Updated version and build strings. 2016-01-18 17:35:45 +01:00
mdtrooper 66ce615a2e Disable in the code the get total alerts in the main search. TICKET: #3126 2016-01-18 12:40:51 +01:00
artica 50047bd4fb Auto-updated build strings. 2016-01-18 00:01:21 +01:00
artica a50999dc6c Auto-updated build strings. 2016-01-17 00:01:21 +01:00
artica d6ab0f764d Auto-updated build strings. 2016-01-16 00:01:44 +01:00
Arturo Gonzalez 0ff8562a61 Fixed problem with group view and strict users. Ticket#3223 2016-01-15 15:57:18 +01:00
Arturo Gonzalez 5e01c8892a Added visual data to not init monitors in group view. 2016-01-15 13:20:55 +01:00
Arturo Gonzalez 53940d274a Added new data in groups view and fixed some numeric errors. 2016-01-15 12:48:15 +01:00
artica 731e550bee Auto-updated build strings. 2016-01-15 00:01:20 +01:00
Arturo Gonzalez 41a472ff95 Fixed problem when searches strange modules in tree (group tree). Ticket #3204 2016-01-14 12:49:15 +01:00
artica 45013e5d71 Auto-updated build strings. 2016-01-14 00:01:26 +01:00
fermin831 7e6f3c46c4 Blocks nonexistent id_agent when updating modules with api #3191 2016-01-13 18:24:43 +01:00
fermin831 a344615359 Modified server tarball to permit enterprise installer call (from-binary option) 2016-01-13 16:07:47 +01:00
mdtrooper b94f47f3a9 Fixed the refresh time in the enterprise dashboard. TICKET: #3156 2016-01-13 14:10:49 +01:00
mdtrooper ea11282439 Cleaned duplicated order values in the reports. TICKET: #3156 
(cherry picked from commit 51c5b6214a)
 2016-01-13 13:03:01 +01:00
mdtrooper 63566dd3af Fixed the hbars for the report exception item. TICKET: #3153 2016-01-13 10:34:01 +01:00
Hirofumi Kosaka 6ae409418f Updated DataServer to accept 'alert_template' directive. 2016-01-13 15:30:45 +09:00
artica 51df3f9f2a Auto-updated build strings. 2016-01-13 00:01:33 +01:00
mdtrooper e43a854ad0 Fixed the style of some report items with data in columns. TICKET: #3152 
(cherry picked from commit 0b933d86e9)
 2016-01-12 16:33:46 +01:00
mdtrooper ca296834bf Fixed the style of some report items with data in columns. TICKET: #3152 2016-01-12 16:03:49 +01:00
mdtrooper 7681bb1f2a Readded the extension admin page. TICKET: #3149 
(cherry picked from commit 703b27027f)
 2016-01-12 14:08:59 +01:00
mdtrooper 84a8000b5b Added a deprecated parameter into the function 'networkmap_generate_dot' for some users. TICKET: #2382 2016-01-12 12:30:23 +01:00
artica f57d00d0af Auto-updated build strings. 2016-01-12 00:01:28 +01:00
mdtrooper ed78a4e44f Fixed there are many bullet charts in one page (such as dashboard). TICKET: #3187 
(cherry picked from commit 11f9f2ec32)
 2016-01-11 15:18:37 +01:00
mdtrooper a5f8a9ca24 Fixed the PHP warnings that burns the file systems. TICKET: #3054 2016-01-11 14:02:00 +01:00
mdtrooper 69f66940e7 Revert "Fixed the position of footer in the css." 
This reverts commit 6f9d9e49ec.

(cherry picked from commit b9100e8c69983e77e0b593afd4ded86e2d25da25)
 2016-01-11 12:40:28 +01:00
artica d5d089c4bc Auto-updated build strings. 2016-01-11 00:01:21 +01:00
artica 4ec2cf4e50 Auto-updated build strings. 2016-01-10 00:01:20 +01:00
artica 9b61619409 Auto-updated build strings. 2016-01-09 00:01:21 +01:00
mdtrooper f2afb2e05f Fixed the horizontal bars in the dashboard. TICKET: #3157 2016-01-08 10:47:04 +01:00
mdtrooper 4772b25f5d Killing some unicorns and magic numbers. 2016-01-08 10:25:12 +01:00
Hirofumi Kosaka 35eeedf996 (only for Oracle) Fixed if direccion of any agents has NULL, snmp console fail to list 
unregistered agents' trap (by using "NOT IN" against NULL-inclued list).
 2016-01-08 17:33:34 +09:00
artica 9503fe076a Auto-updated build strings. 2016-01-08 00:01:54 +01:00
artica 2fd35547c5 Auto-updated build strings. 2016-01-07 00:01:25 +01:00
artica e1818a57f4 Auto-updated build strings. 2016-01-06 00:01:38 +01:00
mdtrooper 9c870cdae2 Added documentation for locale_agent call. TICKET: #3119 
(cherry picked from commit aceb7ac34f)

Conflicts:
	pandora_server/util/pandora_manage.pl

(cherry picked from commit c12a6c1e3a)
 2016-01-05 13:27:43 +01:00
mdtrooper ce76d8fc50 Fixes for the management groups in the API. TICKET: #3119 
(cherry picked from commit f9ee9a7032)
 2016-01-05 12:19:49 +01:00
Arturo Gonzalez 582b15b9fa Fixed some things in delete massive modules (oracle) 2016-01-05 10:03:09 +01:00
Junichi Satoh 7fb3c069b5 Fixed that an unexpected alert is fired after recovering from unknown state 
during ff_threshold is activated.

(cherry picked from commit ba0f218216)
 2016-01-05 11:14:19 +09:00