Commit Graph

911 Commits

Author SHA1 Message Date
Daniel Rodriguez 1b9916c6e9 Merge branch 'ent-6818-bug-en-label-de-informes-y-plantillas' into 'develop'
fixed error with label reporting views

See merge request artica/pandorafms!3938
2021-04-09 09:24:44 +00:00
Daniel Rodriguez 1f61161e6f Merge branch 'ent-6997-bug-unidades-item-general-summation' into 'develop'
General report exponent prefix shows with blankspace

See merge request artica/pandorafms!3924
2021-04-07 13:15:38 +00:00
Daniel Rodriguez 9813586f0d Merge branch 'ent-6935-OPEN-mouse-over-confuso-items' into 'develop'
Added more clear message

Closes pandora_enterprise#6935

See merge request artica/pandorafms!3853
2021-04-07 10:54:20 +00:00
Daniel Rodriguez 8b817c63c7 Merge branch 'ent-6994-cambiar-el-orden-de-los-items-de-un-template-en-iformes-no-funciona' into 'develop'
unsort template items

See merge request artica/pandorafms!3810
2021-04-06 17:22:33 +00:00
Daniel Rodriguez 859c174c1b Merge branch 'ent-7093-Item-group-event-report-chequea-tabla-incorrecta' into 'develop'
fixed error events reports

See merge request artica/pandorafms!3902
2021-04-06 16:59:42 +00:00
Jose Gonzalez 5eeb3423f0 Solve merge 2021-03-31 10:29:57 +02:00
Marcos Alconada 3d350ba481 fixed visual error 2021-03-26 09:32:30 +00:00
Daniel Maya 79914082e9 Ent 6850 quitar nta 2021-03-24 15:16:13 +00:00
marcos 31e6d75229 fixed error with label reporting views 2021-03-22 14:28:12 +01:00
marcos c9f0b138b0 fixed error with label reporting views 2021-03-22 12:24:58 +01:00
marcos d5df7bf9ce fixed error with label reporting views 2021-03-22 12:01:17 +01:00
Calvo 58dc4aee0d General report exponent prefix shows with blankspace 2021-03-16 13:37:57 +01:00
Daniel Barbero Martin bf4710ba93 fixed error events reports 2021-03-15 13:26:29 +01:00
Daniel Rodriguez 16ee65ba95 Merge branch 'ent-6781-revision-de-estilos-visuales-y-eliminacion-de-sistemas-skins' into 'develop'
Ent 6781 revision de estilos visuales y eliminacion de sistemas skins

See merge request artica/pandorafms!3699
2021-03-11 14:40:24 +00:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
daniel 54fc2e89d3 new report histogram 2021-03-11 14:22:28 +00:00
daniel 6e0188fac1 add summary report availability graph 2021-03-09 16:32:12 +00:00
Daniel Rodriguez 23cddae261 Merge branch 'ent-5229-filtro-event-report' into 'develop'
Added string exclude filter to events reports

See merge request artica/pandorafms!3748
2021-03-01 15:28:18 +00:00
Jose Gonzalez dac99fa4c6 Added more clear message 2021-02-19 12:29:48 +01:00
fbsanchez 40e97f6cf6 Removed warnings 2021-02-09 10:25:08 +01:00
marcos 9454ed2ff3 unsort template items 2021-02-01 12:11:39 +01:00
alejandro-campos a0931d7ada changes in dashboard permissions 2021-01-15 13:52:31 +01:00
Luis Calvo df9bc6198d Added string exclude filter to events reports 2020-12-29 12:04:09 +01:00
José González 02475d25b6 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_console/general/header.php
#   pandora_console/general/sap_view.php
2020-12-23 06:48:22 +01:00
Daniel Rodriguez b2363fb003 Merge branch 'ent-6509-agent-details-error-en-conteo-total-de-modulos' into 'develop'
included not init modules in total count

See merge request artica/pandorafms!3645
2020-12-22 16:29:39 +01:00
daniel b230e17cc2 fix report groups status metaconsole 2020-12-17 17:04:52 +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
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
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
Luis 734341bf2d Ent 6148 new report permissions 2020-11-30 14:52:03 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Daniel Barbero Martin fba3bbbc93 fix dashboard widget groups status add secondary groups 2020-11-24 16:56:41 +01:00
alejandro-campos e2bdb4858a included not init modules in total count 2020-11-24 16:13:28 +01:00
marcos b42cb5a30f Merge remote-tracking branch 'origin/develop' into ent-6422-10782-Error-entity-en-informe-SQL-query 2020-11-24 08:59:44 +01:00
daniel b3043c2e01 Fixed template events 2020-10-30 13:29:50 +01:00
marcos 07e2d5f4aa Merge branch 'ent-6422-10782-Error-entity-en-informe-SQL-query' of https://brutus.artica.es:8081/artica/pandorafms into ent-6422-10782-Error-entity-en-informe-SQL-query 2020-10-30 11:34:34 +01:00
Daniel Rodriguez a7a2bdf831 Merge branch 'ent-6483-bug-en-la-recursion-de-grupos-del-item-group-report-de-informes' into 'develop'
Ent 6483 bug en la recursion de grupos del item group report de informes

See merge request artica/pandorafms!3549
2020-10-29 14:56:04 +01:00
Daniel Rodriguez 8144d3bc95 Merge branch 'ent-6497-bug-en-item-group-alert-report-seleccionando-el-grupo-all' into 'develop'
Forced recursion while selecting All group - group_alert_report

See merge request artica/pandorafms!3543
2020-10-29 12:40:43 +01:00
Daniel Rodriguez 83233b6192 Merge branch 'ent-6485-bug-en-la-recursion-de-grupos-del-item-agents-modules-de-informes' into 'develop'
groups_get_children and propagate update

See merge request artica/pandorafms!3545
2020-10-29 12:36:49 +01:00
fbsanchez 5d69ca3126 recursion taken in mind in group report 2020-10-21 17:54:33 +02:00
fbsanchez 42cca865ac groups_get_children and propagate update 2020-10-21 11:38:57 +02:00
fbsanchez 4babcbe647 Forced recursion while selecting All group - group_alert_report 2020-10-20 18:25:04 +02:00
Daniel Barbero Martin 685acc6c20 fixed report avg-min-max 2020-10-20 16:00:19 +02:00
daniel 510a96af8f fixed sql grph 2020-10-14 11:17:05 +02:00
Daniel Barbero Martin 8a72074a8a fixed sql graph pie 2020-10-09 12:05:57 +02:00
Daniel Rodriguez 76c3fe8e83 Merge branch 'ent-6346-9940-event-group-no-muestra-eventos-para-grupos-secundarios' into 'develop'
Fix secondary groups match while group filtering

See merge request artica/pandorafms!3502
2020-10-08 16:34:20 +02:00
Marcos Alconada 54035e9615 fixed error with sql query pie graph 2020-10-08 11:54:10 +02:00
daniel 3455de7f85 fixed visual errors and default values 2020-10-07 16:03:52 +02:00
fbsanchez 0deff70f8b Alert report (group) Group + secondary groups + recursion 2020-10-07 14:07:17 +02:00