Commit Graph

26141 Commits

Author SHA1 Message Date
Daniel Rodriguez 8321e74c44 Merge branch 'ent-6755-Group-report-toma-los-datos-de-la-tabla-equivocada' into 'develop'
fix report groups status metaconsole

See merge request artica/pandorafms!3662
2020-12-17 17:04:52 +01:00
daniel b230e17cc2 fix report groups status metaconsole 2020-12-17 17:04:52 +01:00
Daniel Rodriguez 7a67412398 Merge branch 'ent-6698-Demos-de-consolas-visuales-sin-el-token-Legacy-Visual-Console-aparecen-vacias' into 'develop'
fix inserts demo VC

See merge request artica/pandorafms!3638
2020-12-17 17:02:42 +01:00
Daniel Rodriguez b58e569063 Merge branch 'ent-6737-Bug-dashboard-con-widget-group-status-no-tiene-en-cuenta-grupos-secundarios' into 'develop'
fix dashboard widget groups status add secondary groups

See merge request artica/pandorafms!3647
2020-12-17 17:01:16 +01:00
Daniel Rodriguez 22159a6d69 Merge branch 'ent-6800-campos-no-se-guaerdan-plantillas' into 'develop'
Ent 6800 campos no se guaerdan plantillas

Closes pandora_enterprise#6800

See merge request artica/pandorafms!3693
2020-12-17 17:00:07 +01:00
Daniel Rodriguez 46b8d79bb7 Merge branch 'ent-5351-Label-descuadrado-en-pdf-de-informe-con-gráfico-custom-sql-de-barras-verticales' into 'develop'
fix legend pdf chart verticals

See merge request artica/pandorafms!3660
2020-12-17 16:58:20 +01:00
daniel 76da033775 fix legend pdf chart verticals 2020-12-17 16:58:20 +01:00
Daniel Rodriguez 7ae5b65740 Merge branch 'ent-6282-module-templates-sin-datos' into 'develop'
Fixed issue

Closes pandora_enterprise#6282

See merge request artica/pandorafms!3624
2020-12-17 16:56:17 +01:00
Daniel Rodriguez ef4f865ca3 Merge branch 'ent-6682-module-templates-deja-añadir-el-mismo-componente-varias-veces' into 'develop'
error con modulos duplicados en module templates

See merge request artica/pandorafms!3610
2020-12-17 16:55:30 +01:00
Marcos Alconada f9b2417d89 error con modulos duplicados en module templates 2020-12-17 16:55:30 +01:00
Daniel Rodriguez aaaabc518f Merge branch 'ent-6340-Ventana-info-agente-tree-view-Metaconsola' into 'develop'
fix dialog tree view meta

See merge request artica/pandorafms!3653
2020-12-17 16:53:42 +01:00
Daniel Rodriguez 697b467a77 Merge branch 'ent-5115-Metaconsola-Vista-de-monitores' into 'develop'
Ent 5115 metaconsola vista de monitores

See merge request artica/pandorafms!3659
2020-12-17 16:51:57 +01:00
Daniel Rodriguez b75d1149e0 Merge branch 'ent-4025-Cambio-de-contrase-en-user-edit-no-pide-contraseña-actual' into 'develop'
active user password check

See merge request artica/pandorafms!3689
2020-12-17 16:48:26 +01:00
Daniel Rodriguez ec472f6c6f Merge branch 'ent-6446-Bug-visual-en-el-full-screen-mode-de-consolas-visuales' into 'develop'
fix visual view pure CV

See merge request artica/pandorafms!3643
2020-12-17 16:45:05 +01:00
Daniel Rodriguez 15df6c066b Merge branch 'ent-6613-bug-en-filtro-de-network-components-metaconsola' into 'develop'
Ent 6613 bug en filtro de network components metaconsola

See merge request artica/pandorafms!3599
2020-12-17 16:39:49 +01:00
Daniel Rodriguez 615fd082e5 Merge branch 'ent-6637-triggered-alerts-tactical-view-meta-bug' into 'develop'
Fixed alert count bug on tactical view

See merge request artica/pandorafms!3603
2020-12-17 16:38:32 +01:00
Daniel Rodriguez 398cc3ac2a Merge branch 'ent-6689-Selector-de-grupos-muy-estrecho-en-Monitors-View-metaconsola' into 'develop'
fix name filters

See merge request artica/pandorafms!3664
2020-12-17 16:37:31 +01:00
artica 2692da94f5 Auto-updated build strings. 2020-12-17 01:00:17 +01:00
artica b5d52a5afe Auto-updated build strings. 2020-12-16 01:00:16 +01:00
Rafael 195790b4cc add dependencies in base docker image 2020-12-15 14:53:00 +01:00
Daniel Rodriguez 0f03924c1a Merge branch 'ent-6861-fping-as-dependencie' into 'develop'
add fping as dependencie for pandora server open rpms

See merge request artica/pandorafms!3728
2020-12-15 14:49:18 +01:00
fbsanchez 58338c5cb3 Increased phantomjs timeout to 120 seconds per resource 2020-12-15 14:33:40 +01:00
Rafael c06940c181 add fping as dependencie for pandora server open rpms 2020-12-15 12:57:48 +01:00
Rafael b4bea077e0 add dependencies in base docker image 2020-12-15 12:44:46 +01:00
Jose Gonzalez 397254e4d8 Added fix 2020-12-15 10:45:37 +01:00
Jose Gonzalez 13d7889cc4 Applied fix 2020-12-15 09:57:09 +01:00
artica fcb7d36146 Auto-updated build strings. 2020-12-15 01:00:07 +01:00
Daniel Rodriguez 54712de36f Merge branch 'ent-6831-Ticket-Guardia-10822-SNMP-Wizard-Interface' into 'develop'
Ent 6831 ticket guardia 10822 snmp wizard interface

See merge request artica/pandorafms!3719
2020-12-14 17:53:28 +01:00
Daniel Rodriguez b14319b298 Merge branch 'ent-6827-error-de-empaquetado-de-agentes-via-sources-tanto-rpm-como-tarball' into 'develop'
Unique file for linux agent

See merge request artica/pandorafms!3722
2020-12-14 16:36:17 +01:00
vanessa gil 5763948625 Updated version. 2020-12-14 13:52:54 +01:00
fbsanchez 009c4ca32b minor change 2020-12-14 12:04:20 +01:00
fbsanchez e330c890c8 extra fucntions copied from plugintools needed 2020-12-14 11:53:17 +01:00
fbsanchez 051498b11a Unique file for linux agent 2020-12-14 11:41:06 +01:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
2020-12-14 11:10:35 +01:00
artica f2eee8fde8 Auto-updated build strings. 2020-12-14 01:00:14 +01:00
artica d684d3cfeb Auto-updated build strings. 2020-12-13 01:00:14 +01:00
artica 37478e3b49 Auto-updated build strings. 2020-12-12 01:00:16 +01:00
Daniel Maya 46d40b72c2 Fixed snmp interfaces 2020-12-11 14:42:37 +01:00
fbsanchez 4d2b890712 minor fixes 2020-12-11 11:31:18 +01:00
fbsanchez 79c8c852b3 Force try remote before falling back to local if admin user 2020-12-11 11:26:45 +01:00
artica c613828777 Auto-updated build strings. 2020-12-11 01:00:15 +01:00
Daniel Maya d642cbea43 Fixed empty agents 2020-12-10 14:07:36 +01:00
artica 463013b06a Auto-updated build strings. 2020-12-10 01:00:06 +01:00
artica 17ea6b85c0 Updated version and build strings. 2020-12-09 16:44:12 +01:00
Daniel Rodriguez 4b51e26086 Merge branch 'ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery' into 'develop'
discovery.cloud.gcp

See merge request artica/pandorafms!3479
2020-12-09 13:54:25 +01:00
fbsanchez b4bb0a1dcf warn while no instances are shown in map quick preview (discovery GCP) 2020-12-09 12:23:49 +01:00
artica 3a530d9a33 Auto-updated build strings. 2020-12-09 01:00:13 +01:00
artica 12dca46e6f Auto-updated build strings. 2020-12-08 01:00:14 +01:00
artica 85c8dfe52f Auto-updated build strings. 2020-12-07 01:00:13 +01:00
artica f016803dbf Auto-updated build strings. 2020-12-06 01:00:13 +01:00