daniel
123d49d604
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
...
Conflicts:
pandora_console/include/functions_graph.php
pandora_console/include/styles/pandora.css
2018-05-10 08:52:45 +02:00
fermin831
6297b20bf6
Added hint to Realtime SNMP graph
2018-05-07 13:30:09 +02:00
fermin831
fd91ba63f6
Added realtime graph to monitor view
2018-05-07 12:53:12 +02:00
fermin831
0f4daee237
Added icon to realtime SNMP graph
2018-05-04 13:18:33 +02:00
fermin831
bd3f0712f1
Added separated window view to SNMP realtime graphs
2018-05-04 10:58:37 +02:00
fermin831
32822054d6
Added realtime graph button to agent view
2018-05-03 17:13:38 +02:00
daniel
e7a8706434
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
...
Conflicts:
pandora_console/include/functions_graph.php
pandora_console/include/graphs/fgraph.php
pandora_console/include/graphs/flot/pandora.flot.js
pandora_console/include/graphs/functions_flot.php
2018-04-23 12:21:11 +02:00
daniel
d881e0028d
fixed errors detected SLA
2018-03-16 12:03:51 +01:00
daniel
d2390528ac
fixed errors in graphs
2018-02-27 16:28:00 +01:00
enriquecd
ae471bb9f2
Merge remote-tracking branch 'origin/clusters' into 1748-Sistema-de-gestión-de-Clusters
2018-02-07 13:52:44 +01:00
enriquecd
2b446a681d
Popup when click modules in cluster view, new images, filter modules - #1748
2018-01-30 17:38:29 +01:00
daniel
57990d80a8
fixed warnings php
2018-01-11 13:05:31 +01:00
daniel
d7d1cfe81b
Merge branch 'develop' into 1632-Pandora_FMS_charts
2017-12-13 17:18:36 +01:00
fermin831
84ff86fede
keepalive modules are boolean too (console function fix)
2017-12-11 15:47:38 +01:00
daniel
06c1c4f243
fixed errors in fullscale graph and normal graph
2017-12-05 13:44:42 +01:00
vgilc
93c0ddfad4
Merge branch 'ent-1545-no-mostrar-valor-de-modulos-booleanos-en-static-graphs-carrefour' into 'develop'
...
Removed last value on visual console boolean static graphs
See merge request artica/pandorafms!1053
2017-11-29 16:56:36 +01:00
fermin831
6c519ff08a
Removed last value on visual console boolean static graphs
2017-11-13 11:13:42 +01:00
vgilc
68a10343fb
Revert "Merge branch…"
...
This reverts merge request !1025
2017-11-10 12:24:33 +01:00
daniel
c780cb5285
fixed errors in fullscale graph and normal graph
2017-11-07 09:46:37 +01:00
fermin831
443163515d
Added checkbox to free search on agents data view
2017-11-02 15:51:37 +01:00
fermin831
2adf951121
Added free search values to data table
2017-10-30 15:45:31 +01:00
Daniel Maya
d7f3e1ecde
New feature. Dynamic units
2017-09-14 12:10:41 +02:00
daniel
c29d8a4fdb
Revert "merge develop"
...
This reverts commit 8232911713
, reversing
changes made to f5da86ac0a
.
2017-08-23 09:35:17 +02:00
vgilc
9c32a72c9f
Merge branch 'develop' into '1077-sql-error-in-log4x-data-module-dialog-dev'
...
# Conflicts:
# pandora_console/include/functions_modules.php
2017-08-14 15:26:54 +02:00
Arturo Gonzalez
d0bd0b3a3b
Changed field in sql request
2017-07-10 12:46:02 +02:00
Daniel Maya
4693702741
Fixed sql error in tagente_datos_log4x
2017-06-12 13:43:53 +02:00
enriquecd
6e951bf50b
Ignore 0 value modules interval when check last contact in agent details - #888
2017-05-17 13:26:10 +02:00
enriquecd
7034f7afc6
Check interval filter agents without modules and disabled modules - #74
2017-02-28 14:29:05 +01:00
enriquecd
63c112a628
Functions_module now not use async modules to calc if last contact is major than minimum module interval - #74
2017-02-21 18:45:44 +01:00
Alejandro Gallardo Escobar
e53d75d98d
Added a function to get the agent alias using a module id
2017-02-20 18:50:28 +01:00
m-lopez-f
e118729398
Fixed problems with column 'last contact'. Gitlab: #269
2017-02-17 13:34:30 +01:00
Arturo Gonzalez
9a73cb56d7
Added module crontab to local modules with rc. Ticket #246
2017-02-10 11:43:12 +01:00
enriquecd
f9817a26ad
Add enterprise_hook filter to all config_agents_has_remote_configuration functions - #41
2017-02-02 19:12:22 +01:00
Arturo Gonzalez
cfce014ad3
UX console in progress... (Fixed filter form in policy modules)
2017-01-19 10:13:59 +01:00
Arturo Gonzalez
fe6f924d7a
UX console in progress... (init develop and modules hierachy)
2017-01-18 12:45:25 +01:00
daniel
9e391e0210
Allow dinamic ip
2017-01-17 09:21:46 +01:00
daniel
cf2c0a87b6
Revert "Merge branch '17-compatibilidad-ante-cambios-de-ip-en-el-agente-integria-4208' into 'develop'"
...
This reverts merge request !31
2017-01-17 09:03:17 +01:00
daniel
7261b50a4e
Allow automatic ip
2017-01-16 17:46:59 +01:00
Arturo Gonzalez
c3480f6c04
Added some things to agent_module report. Ticket #4183
2016-12-22 11:35:45 +01:00
m-lopez-f
70bb715516
Change value by deafult of new modules in field discard unknown events. Ticket: #4242
...
(cherry picked from commit 8593fb1bb5
)
2016-12-01 15:16:36 +01:00
Arturo Gonzalez
26862b5f9d
Added a function to remove right zeros in precision data feature
2016-10-20 10:47:12 +02:00
Arturo Gonzalez
3b7cad9654
Data precision (So much precision)
2016-10-18 16:32:39 +02:00
m-lopez-f
a804040d79
Add label with macros in reports. Ticket: #37
2016-09-12 16:22:58 +02:00
Arturo Gonzalez
dbb5aeee4c
Fixed monitor details search by module name and module group. Ticket #4025
2016-09-12 11:54:54 +02:00
m-lopez-f
a98242d151
Fixed problems with times of execution and load page. Tiquet: #3988
2016-08-24 15:31:28 +02:00
Ramon Novoa
798fa8e952
Merge branch 'handle-unknown-properly' of https://github.com/uchida/pandorafms into uchida-handle-unknown-properly
2016-07-28 12:50:58 +02:00
fermin831
1c94eee171
Solved problems with availability reports and unknown time (2)
...
Tickets #3449
2016-05-27 14:11:26 +02:00
mdtrooper
30f806f41c
Merge branch 'develop' into feature/new_networkmap
...
Conflicts:
pandora_console/include/functions_modules.php
2016-04-25 15:25:16 +02:00
mdtrooper
0de64812c2
Added the get status of any module group.
2016-04-22 11:14:25 +02:00
Akihiro Uchida
1da312b8a5
use last_known_status/known_status column to handle unknown properly
2016-04-22 16:36:26 +09:00
fermin831
11623b5c92
Fixed checks in availability reports TICKETS #3449
2016-03-30 14:59:34 +02:00
m-lopez-f
858e3ea202
Fixed problems with performance. Tiquet: #2970
...
(cherry picked from commit a57f62e5bf
)
2015-11-18 16:32:20 +01:00
m-lopez-f
579793fa66
Fixed problems with bulk actions with modules. Tiquet: #2963
...
(cherry picked from commit ca0ec7364c
)
2015-11-17 08:32:45 +01:00
m-lopez-f
05f45e2692
Fixed problems with bulk module edit. Tiquet: #2837
2015-10-02 09:10:33 +02:00
m-lopez-f
6858a12c57
Fixed function, and add condition if agent is not init. Tiquet: #2804
...
(cherry picked from commit 4d73c6ca7c
)
2015-09-23 13:09:17 +02:00
m-lopez-f
df6b3efe1a
Fixed function, and add condition if agent is not init. Tiquet: #2804
2015-09-23 12:41:59 +02:00
mdtrooper
4d62e41d24
Added functions in modules to get table of data and raw data.
...
(cherry picked from commit 2f98c1fc86
)
2015-08-05 14:04:17 +02:00
m-lopez-f
cd676cac59
change in the way data show snmp data timeticks. Tiquet: #2494
2015-07-31 11:16:42 +02:00
m-lopez-f
3e0b8a0f52
Fixed errors in php
2015-07-27 15:34:09 +02:00
mdtrooper
9bc9e6f729
Fixed the availability item report. TICKET: #2423
2015-07-21 18:50:57 +02:00
mdtrooper
a8162a1876
Added function 'modules_is_not_init'
2015-07-21 13:06:22 +02:00
Alejandro Gallardo Escobar
3b037caf32
Merge remote-tracking branch 'origin/develop' into features/oracle
2015-06-18 20:02:01 +02:00
mdtrooper
89cac169f4
Clean the source code style.
2015-06-08 11:05:19 +02:00
mdtrooper
819b1d5d77
Clean the source code style.
2015-06-08 09:32:01 +02:00
mdtrooper
371aafa3fa
Fixes for the Oracl€.
2015-06-05 14:47:50 +02:00
mdtrooper
4a86e40ca2
Fixed the PHP Warning about the config var. (manual cherry-pick from e326c8ff20
)
2015-06-05 12:52:18 +02:00
mdtrooper
5c7b230e9b
Merge some changes and fixed from the 'develop' branch.
2015-05-29 14:16:39 +02:00
mdtrooper
1160fd800c
Fixed the 'availability' item in report. (Merge from 5d25b7c8e6
)
2015-05-26 17:20:34 +02:00
Alejandro Gallardo Escobar
137acdb232
Merge remote-tracking branch 'origin/develop' into features/oracle
...
Conflicts resolved:
pandora_console/include/functions_reporting.php
2015-05-19 19:16:35 +02:00
mdtrooper
73e0a74a1a
Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.item_editor.php
pandora_console/include/functions_reporting.php
2015-05-06 17:02:40 +02:00
Alejandro Gallardo Escobar
a98be1cad9
Merge remote-tracking branch 'origin/develop' into features/oracle
2015-05-04 17:28:42 +02:00
m-lopez-f
6241ae13d6
Add new option, when is active data of modules type is proc, show ok or fail. Tiquet: #1996
2015-05-04 15:44:37 +02:00
Alejandro Gallardo Escobar
3264c65ef8
Fixed some problems with oracle compatibility
2015-04-30 12:35:42 +02:00
m-lopez-f
0df919dcdd
Fixed order data to click in show data module in tree view,tiquet: #2080
2015-04-16 15:18:11 +02:00
mdtrooper
f84863540f
Merge from the pandora_5.1 branch to feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES branch the new report items (availability and time overlaped in the simple graphs).
2015-04-10 00:58:24 +02:00
mdtrooper
2646d92b86
Added the function 'modules_is_disable_agent' and fixed the show disabled agents in reports into items 'general' 'sla'.
...
(cherry picked from commit cf9c53f220
)
2015-03-16 11:59:11 +01:00
Ramon Novoa
df651810d4
Added support for password encryption to the Pandora FMS Console.
2015-03-02 17:30:19 +01:00
mdtrooper
ea8662c7bc
Fixed the connection to node in metaconsole when show the data module dialog. TICKET: #1870
...
(cherry picked from commit eea8e0d8ae
)
2015-03-02 11:41:32 +01:00
mdtrooper
609802eb44
Fixed the string module data in reports of items 'general'. #1819
2015-02-23 15:13:21 +01:00
m-lopez-f
f9e378d1d6
Fixed problem with call function and not send all variables
2015-01-29 16:41:28 +01:00
m-lopez-f
d2238434f0
Fixed problem in tree view to metaconsola, not open popup
...
(cherry picked from commit 33bf0a4e7b
)
2015-01-28 11:29:51 +01:00
mdtrooper
45a4880ec6
Added modules in the treeview
2014-12-19 18:13:47 +01:00
mdtrooper
b42d643968
Finish the working in the tags out the policies. Ticket: #1577
2014-12-12 15:01:50 +01:00
Alejandro Gallardo Escobar
e89565e760
Modified a bunch of functions to choose when the history db should be used and when not
2014-10-22 12:00:14 +02:00
mdtrooper
58fc774564
Added function 'modules_get_agent_group'
2014-10-20 16:45:47 +02:00
mdtrooper
25bed01edb
Fixed the update the tags. Ticket # 1417
2014-10-07 13:48:48 +02:00
mdtrooper
0963cda9fb
2014-08-12 Miguel de Dios <miguel.dedios@artica.es>
...
* include/functions_modules.php: killed some unicorns and magic
numbers into the function "modules_get_status".
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10408 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-12 12:58:21 +00:00
mdtrooper
ce3b41c0da
2014-05-23 Miguel de Dios <miguel.dedios@artica.es>
...
* include/functions_modules.php,
include/functions_networkmap.php: added the filters for the
CIDR network masks.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9994 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-23 14:42:55 +00:00
mdtrooper
a65a494f7f
2014-05-07 Miguel de Dios <miguel.dedios@artica.es>
...
* include/functions_ui.php, include/functions_networkmap.php: clean
source code style.
* include/functions_modules.php: added function
"modules_get_interfaces".
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9881 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-07 17:15:48 +00:00
mdtrooper
e3f38440d3
2014-03-01 Miguel de Dios <miguel.dedios@artica.es>
...
* include/functions_modules.php, operation/agentes/exportdata.php:
fixed the export data from modules with string data.
Incident: #707
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9695 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-04-01 13:50:58 +00:00
mdtrooper
b4305d7b9a
2014-03-20 Miguel de Dios <miguel.dedios@artica.es>
...
* images/group_green.disabled.png, images/group_green.png,
extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql,
extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql,
extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql,
godmode/reporting/visual_console_builder.editor.js,
godmode/agentes/configurar_agente.php, include/styles/pandora.css,
include/functions_networkmap.php, include/functions_agents.php,
include/functions_visual_map_editor.php,
include/functions_modules.php, include/functions_groups.php,
include/constants.php, include/functions_visual_map.php,
include/ajax/visual_console_builder.ajax.php, pandoradb.sql,
pandoradb.postgreSQL.sql, pandoradb.oracle.sql: added the feature to
show the item for groups in visualmap.
Incident: #671
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9621 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-20 16:43:42 +00:00
alexhigh
5fe4fbf696
2014-03-19 Alejandro Gallardo <alejandro.gallardo@artica.es>
...
* pandoradb_data.sql,
pandoradb.data.oracle.sql,
pandoradb.data.postgreSQL.sql: Deleted an old link
and updated the link to the Pandora FMS documentation.
* pandoradb.sql,
pandoradb.postgreSQL.sql,
pandoradb.oracle.sql,
extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql,
extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql,
extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql:
Added the column "l2_network" to the table "tnetwork_map".
* godmode/agentes/module_manager_editor_common.php:
Added a help tip to a column of relations.
* include/functions_modules.php: Improved the function
"modules_relation_exists".
* operation/agentes/networkmap.topology.php,
include/functions_networkmap.php,
operation/agentes/networkmap.php: Added a new option
to show the relations between the agents interfaces.
* operation/agentes/estado_monitores.php: Added a tooltip
to show the relations of a monitor in the monitor list.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9618 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-19 16:43:08 +00:00
alexhigh
a2a6875091
2014-03-18 Alejandro Gallardo <alejandro.gallardo@artica.es>
...
* pandoradb.data.oracle.sql,
pandoradb.data.postgreSQL.sql,
pandoradb.sql,
extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql,
extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql,
extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql:
Added the table "tmodule_relationship".
* operation/agentes/estado_generalagente.php: Added a
new table to show the network interfaces of the agent.
Minor fixes.
* include/styles/pandora.css: Added properties for the
class transparent'.
* include/ajax/module.php: Fixed an error and added code
to retrieve a module autocomplete input or add, remove
or update a module relation via ajax.
* include/functions_modules.php: Added the functions
"modules_get_relations", "modules_relation_exists",
"modules_add_relation", "modules_delete_relation" and
"modules_change_relation_lock".
* godmode/agentes/module_manager_editor_common.php:
Added a table and control to show, add or delete
relations with other modules. Added the javascript
functions "change_modules_autocomplete_input",
"add_new_relation", "change_lock_relation" and
"delete_relation".
* godmode/agentes/module_manager_editor.php: Added a
line to show the module relations table and control.
* godmode/agentes/module_manager_editor_network.php:
Minor fix.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9610 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-18 11:49:33 +00:00
zarzuelo
1e6b6b5776
2014-02-07 Sergio Martin <sergio.martin@artica.es>
...
* include/functions_visual_map.php
include/functions_modules.php
include/functions_agents.php
include/constants.php: Add code to new "status"
Warning fired in visual maps
* mobile/operation/agent.php: Fix first time charge
of code that set same size to both boxes in agent view
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9413 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-07 11:29:20 +00:00
mdtrooper
a3a82671ee
2014-01-22 Miguel de Dios <miguel.dedios@artica.es>
...
* godmode/reporting/reporting_builder.item_editor.php,
include/constants.php, include/functions_reporting.php: added
constants and killed magic numbers and unicorns.
* include/functions_modules.php: added function
"modules_get_modules_in_group".
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9353 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-22 12:52:43 +00:00
jsatoh
410fe3d471
2013-12-01 Junichi Satoh <junichi@rworks.jp>
...
* include/functions_modules.php: Corrected agent counting by module
group.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9148 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-01 02:17:12 +00:00
jsatoh
f7b2255a6c
2013-11-27 Junichi Satoh <junichi@rworks.jp>
...
* include/functions_modules.php: Fixed that some multibyte characters
are recognized as invalid characters on module creation.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9135 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-27 04:43:14 +00:00
mdtrooper
94765e927f
2013-10-25 Miguel de Dios <miguel.dedios@artica.es>
...
* godmode/massive/massive_copy_modules.php,
include/functions_modules.php: fixed the module massive copy from
agent with remote configuration to agent without remote
configuration and with a network module.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8957 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-25 10:15:50 +00:00
mdtrooper
9039157070
2013-10-16 Miguel de Dios <miguel.dedios@artica.es>
...
* godmode/massive/massive_delete_modules.php,
include/functions_modules.php: fixed the delete modules with
conf from the massive operations.
2013-10-16 Miguel de Dios <miguel.dedios@artica.es>
* pandoradb_data.sql,
extensions/update_manager/sql/update_manager.sql,
extensions/update_manager/sql/update_manager.postgreSQL.sql,
extensions/update_manager/sql/update_manager.oracle.sql,
extensions/system_info.php, pandoradb.data.postgreSQL.sql,
pandoradb.data.oracle.sql, extras/pandora_diag.php: removed the
unused path to keygen.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8924 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-16 10:30:35 +00:00
mdtrooper
f132f1eeab
2013-09-25 Miguel de Dios <miguel.dedios@artica.es>
...
* include/functions_modules.php: made more easy the merge with the
last branch.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8810 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-25 09:36:12 +00:00