Commit Graph

490 Commits

Author SHA1 Message Date
Alejandro Campos 0f381b0db7 Merge branch 'develop' into 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada'
# Conflicts:
#   pandora_console/extras/mr/66.sql
2023-10-03 13:11:09 +00:00
Daniel Rodriguez 05cd8142bf Merge branch 'ent-11471-integracion-pandora-integria' into 'develop'
wip integration integriaIMS pandora_enterprise#11471

Closes pandora_enterprise#11471

See merge request artica/pandorafms!6131
2023-09-28 10:05:15 +00:00
daniel 91393c9e39 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/include/styles/pandora.css
2023-09-25 17:06:08 +02:00
daniel f46626e120 refactor cluster view pandora_enterprise#12032 2023-09-21 10:21:45 +02:00
alejandro.campos@artica.es ae74caf7b1 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:52:56 +02:00
Jorge Rincon 764d5908bb Merge branch 'develop' into ent-10065-post-filtros-de-eventos-privados 2023-09-11 10:58:37 +02:00
alejandro.campos@artica.es 318fa38721 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-07 17:44:51 +02:00
alejandro.campos@artica.es f8911bcf9c implemented os version management 2023-09-06 17:00:16 +02:00
daniel a7baab0aba Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-24 12:07:32 +02:00
rafael 27e37f6897 11944 adding patch 773.2 changes on develop 2023-08-24 12:04:27 +02:00
daniel dca15b5637 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-23 18:54:01 +02:00
Pablo Aragon 45c15acf8e 11930-Remove in pandora_db.pl integrity & functions_agents.php 2023-08-23 14:46:55 +02:00
Pablo Aragon 120298e6a3 11930-Remove in pandora_db.pl integrity & functions_agents.php 2023-08-23 14:00:35 +02:00
daniel 7f82273dc4 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/extras/mr/65.sql
2023-08-09 08:59:01 +02:00
Daniel Maya 0534f59f92 #10147 optimize group search 2023-08-04 15:08:57 +02:00
daniel 3e2c2990df Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-20 08:28:36 +02:00
daniel 5cf31fc77e ITSM fixed pandora_enterprise#11471 2023-07-19 11:36:03 +02:00
Rafael Ameijeiras ab94dbba4c Merge branch 'ent-9785-14479-widgets-en-dashboard-no-se-actualizan-de-forma-recursiva-con-el-borrado-de-agentes' into 'develop'
Clean deleted agents from dashboards, reports, etc

See merge request artica/pandorafms!6171
2023-07-18 08:01:49 +00:00
Rafael Ameijeiras f5f86c9fa2 Merge branch 'ma2sim-develop-patch-81134' into 'develop'
Change return value of function agents_get_agent_id_by_alias when alias is ''

See merge request artica/pandorafms!5498
2023-06-29 08:35:28 +00:00
Matias Didier 3bbb0cb233 Merge branch 'ent-11404-15690-ordenar-interfaces-correctamente' into 'develop'
Ent 11404 15690 ordenar interfaces correctamente

See merge request artica/pandorafms!6008
2023-06-26 12:05:29 +00:00
Rafael Ameijeiras d37c0f3d79 Merge branch 'ent-11599-item-grouped-group-report-muestra-la-informacion-de-todos-los-nodos-en-metaconsola' into 'develop'
Ent 11599 Item "Grouped group report" muestra la información de todos los nodos en metaconsola

See merge request artica/pandorafms!6126
2023-06-26 07:50:29 +00:00
Calvo 40ea25eeea Clean deleted agents from dashboards, reports, etc 2023-06-22 18:52:06 +02:00
Daniel Cebrian 9e6130ddfb #11599 fixed grouped reports in meteaconsole 2023-06-16 10:23:37 +02:00
miguel angel rasteu db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu 1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu 64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu 933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
miguel angel rasteu eba2e0d9f1 #11404 Fix order sql query 2023-05-31 15:39:06 +02:00
Daniel Cebrian 90f0c3771f #10324 fixed deleted element fav menu 2023-03-13 17:21:28 +01:00
Daniel Cebrian 3ec11f4c9d Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-08 12:55:53 +01:00
daniel 5d7738a05e Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/ajax/module.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/operation/events/events.php
2023-03-03 08:20:44 +01:00
Daniel Cebrian 08fb4e3396 #10324 fixed delete element in favmenu 2023-02-27 10:07:35 +01:00
Daniel Cebrian 728991ad9a #10324 delete fav menu when delete element 2023-02-24 13:36:13 +01:00
alejandro.campos@artica.es b76a4b1a48 fix conflicts 2023-02-22 10:10:14 +01:00
Shinichi Matsumoto 9994477c06 Change return value of function agents_get_agent_id_by_alias when alias is '' 2023-02-03 08:00:44 +00:00
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
Jose Gonzalez 17c0e78d06 Improve TreeView 2023-01-26 13:25:24 +01:00
daniel 1ebfc58286 fix diabled and remove agents to policies pandora_enterprise#10084 2023-01-26 13:21:28 +01:00
alejandro.campos@artica.es 902a843765 implemented agents view filter management 2023-01-25 17:22:54 +01:00
Jose Gonzalez ffa4ec756c Agent Group icons adding 2022-12-20 17:22:35 +01:00
jose.gonzalez@pandorafms.com 445a8161cf Merge 2022-12-05 09:44:35 +01:00
jose.gonzalez@pandorafms.com dccd950e9e Changes 2022-11-30 10:14:42 +01:00
Daniel Maya c0e5706d85 #9880 Fixed network usage map 2022-11-29 15:41:10 +01:00
Daniel Maya 5a7fcd6cc9 #9813 Fixed starmap 2022-11-15 14:18:12 +01:00
Daniel Barbero ce823dca38 new widget grouped meter graphs pandora_enterprise#8620 2022-10-10 11:20:03 +02:00
Daniel Maya 08815cc2c2 #9261 Fixed 24X7 item 2022-09-07 13:49:05 +02:00
Calvo 642c60428c Merge remote-tracking branch 'origin/develop' into ent-8797-giss-13405-acciones-vista-de-alertas-metaconsola 2022-07-19 09:40:56 +02:00
Calvo 34333f9f88 Alerts list datatable 2022-07-15 12:15:37 +02:00
Daniel Maya 4f7918114b #9029 Added starmap 2 2022-07-12 13:45:01 +02:00
Daniel Maya a71c26b4a7 #9029 Added starmap 2022-07-05 17:44:52 +02:00