Commit Graph

25815 Commits

Author SHA1 Message Date
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
artica 223f3685b3 Auto-updated build strings. 2020-12-05 01:00:17 +01:00
fbsanchez 839890025b Added class per depth level snmp tree 2020-12-04 15:28:22 +01:00
fbsanchez d45a72f355 minor fix PM -> UM for cred access (managemnt) 2020-12-04 13:32:42 +01:00
Daniel Rodriguez 2d83687c2d Merge branch 'ent-5786-alertas-de-inventario' into 'develop'
inventory alerts

See merge request artica/pandorafms!3498
2020-12-04 10:31:22 +01:00
Daniel Maya 369002cb96 inventory alerts 2020-12-04 10:31:22 +01:00
Daniel Rodriguez 9d5759e0f3 Merge branch 'ent-6762-10981-10968' into 'develop'
fix api function show graph

See merge request artica/pandorafms!3636
2020-12-04 09:44:39 +01:00
artica acce2cc2b0 Auto-updated build strings. 2020-12-04 01:00:18 +01:00
fbsanchez 34374159de gcp reviewed 2020-12-03 18:00:20 +01:00
Daniel Rodriguez da9c0c268b Merge branch 'ent-5316-anadir-seccion-credential-store-al-menu-de-discovery' into 'develop'
Ent 5316 anadir seccion credential store al menu de discovery

See merge request artica/pandorafms!3680
2020-12-03 14:48:12 +01:00
Daniel Maya 296cb9125e Ent 5316 anadir seccion credential store al menu de discovery 2020-12-03 14:48:12 +01:00
Daniel Rodriguez 9aaae58cc7 Merge branch 'ent-2323-Modo-Debug-instantáneo' into 'develop'
Added QueryResult ui type

See merge request artica/pandorafms!3517
2020-12-03 14:43:44 +01:00
Daniel Rodriguez e8071f18b1 Merge branch 'ent-6795-clase-invisible-no-importa-tanto' into 'develop'
Fixed

Closes pandora_enterprise#6795

See merge request artica/pandorafms!3678
2020-12-03 12:29:22 +01:00
Daniel Rodriguez aca33ba224 Merge branch 'ent-6752-ventana-desconexion-del-servidor' into 'develop'
Changed check connection method to ajax. Check deleted from login

See merge request artica/pandorafms!3679
2020-12-03 12:27:55 +01:00
Luis 50b1fa3c56 Changed check connection method to ajax. Check deleted from login 2020-12-03 12:27:55 +01:00
Daniel Rodriguez a23d807baf Merge branch 'ent-6787-plugin-server-timeout-no-funciona-correctamente' into 'develop'
minor fixes in pluginserver

See merge request artica/pandorafms!3667
2020-12-03 11:05:22 +01:00
artica fbc14f9d95 Auto-updated build strings. 2020-12-03 01:00:16 +01:00
Daniel Rodriguez 98c5ef7142 Merge branch 'ent-6619-Remote-code-execution' into 'develop'
fixed security vulnerability

See merge request artica/pandorafms!3591
2020-12-02 17:16:05 +01:00
Jose Gonzalez f2a94b9aa5 Merge 2020-12-02 11:38:22 +01:00
Jose Gonzalez eeac1ca35e Merge 2020-12-02 11:28:46 +01:00
Daniel Rodriguez bd17efa3dd Merge branch 'ent-fix-um-permission' into 'develop'
Fixed UM permission problems.

See merge request artica/pandorafms!3675
2020-12-02 10:16:17 +01:00
Daniel Rodriguez 6ffc803060 Merge branch 'ent-6700-botones-en-alertas-correlativas-descolocados' into 'develop'
fixed visual error alert correlated alerts

See merge request artica/pandorafms!3606
2020-12-02 10:15:33 +01:00
Marcos Alconada 909645b4ab fixed visual error alert correlated alerts 2020-12-02 10:15:33 +01:00
Daniel Rodriguez 993e78d482 Merge branch 'ent-5835-9693-error-al-exportar-csv-el-log-view-parte-2' into 'develop'
Ent 5835 9693 error al exportar csv el log view parte 2

See merge request artica/pandorafms!3649
2020-12-02 10:13:22 +01:00
Daniel Maya 3a0f14e7bd Ent 5835 9693 error al exportar csv el log view parte 2 2020-12-02 10:13:22 +01:00
Daniel Rodriguez 67cdd704c4 Merge branch 'ent-6435-vista-de-nodo-en-mapas-de-red-open' into 'develop'
ticket 6435

See merge request artica/pandorafms!3512
2020-12-02 10:10:34 +01:00
Marcos Alconada f72d924f1e ticket 6435 2020-12-02 10:10:34 +01:00
artica 913dc554eb Auto-updated build strings. 2020-12-02 01:00:17 +01:00
fbsanchez eb67b387b9 Merge remote-tracking branch 'origin/develop' into ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery
Conflicts:
	pandora_console/include/class/CredentialStore.class.php
2020-12-01 17:32:02 +01:00
alejandro-campos 59e2930bec fixed global declaration in meta 2020-12-01 13:15:48 +01:00
Jose Gonzalez 82202fe620 Fixed 2020-12-01 12:39:37 +01:00
Daniel Rodriguez 1425b09683 Merge branch 'ent-6532-servicios-en-meta-no-cambian-de-estado-cuando-lo-creas-con-el-prediction-server-bajado' into 'develop'
Orphan service modules + control require argument select from sql

See merge request artica/pandorafms!3571
2020-12-01 12:11:33 +01:00
Daniel Rodriguez e2bffd30c1 Merge branch 'ent-6692-error-CLI-update-group' into 'develop'
Fixed CLI update_group

See merge request artica/pandorafms!3596
2020-12-01 11:57:07 +01:00
Daniel Rodriguez 0d657ab354 Merge branch 'ent-6179-csv-decimal-separator' into 'develop'
Add decimal separator to all pandora csv

See merge request artica/pandorafms!3434
2020-12-01 11:56:15 +01:00
Luis aeb7a7e9c6 Add decimal separator to all pandora csv 2020-12-01 11:56:15 +01:00
Daniel Rodriguez f869fbb7cd Merge branch 'ent-6406-No-se-ven-los-datos-string-en-el-tree' into 'develop'
fixed bad module id reference

See merge request artica/pandorafms!3505
2020-12-01 11:55:56 +01:00
Daniel Rodriguez ff2f7c32f0 Merge branch 'ent-6399-no-funciona-extension-de-chrome' into 'develop'
fixes chrome extension credentials using POST instead GET

See merge request artica/pandorafms!3514
2020-12-01 11:55:08 +01:00
Junichi Satoh 75e070ebb0 Fixed UM permission problems. 2020-12-01 16:46:09 +09:00
artica e0266b53ba Auto-updated build strings. 2020-12-01 01:00:46 +01:00
Daniel Rodriguez f861744229 Merge branch 'ent-6422-10782-Error-entity-en-informe-SQL-query' into 'develop'
SQL query do not need to be cleaned

Closes pandora_enterprise#6422

See merge request artica/pandorafms!3496
2020-11-30 17:26:15 +01:00
Daniel Rodriguez ec91ea7387 Merge branch 'ent-6291-cambio-uso-macros-informes' into 'develop'
Report macros now apply on showing report

See merge request artica/pandorafms!3460
2020-11-30 17:25:22 +01:00
Daniel Rodriguez a24bc6d15c Merge branch 'ent-6148-new-report-permissions' into 'develop'
Ent 6148 new report permissions

See merge request artica/pandorafms!3490
2020-11-30 14:52:03 +01:00
Luis 734341bf2d Ent 6148 new report permissions 2020-11-30 14:52:03 +01:00
Daniel Rodriguez b334e817b3 Merge branch 'ent-6747-campos-15-a-20-macro-fields-snmp-no-funcionan' into 'develop'
Fix bug with macro fields

Closes pandora_enterprise#6747

See merge request artica/pandorafms!3628
2020-11-30 14:32:14 +01:00
Daniel Rodriguez 64509df179 Merge branch 'ent-6536-servicios-item-tipo-agente-desconocido-en-mapa-de-servicio' into 'develop'
Ent 6536 servicios item tipo agente desconocido en mapa de servicio

See merge request artica/pandorafms!3574
2020-11-30 14:29:43 +01:00