ae471bb9f2
Merge remote-tracking branch 'origin/clusters' into 1748-Sistema-de-gestión-de-Clusters
2018-02-07 13:52:44 +01:00
acd1d97a94
Merge branch '1403-Añadir-relojes-a-consolas-visuales-4622-com1-dbchanges' into 'develop'
...
Db changes for clocks in visual console - #1403
See merge request artica/pandorafms!1150
2018-02-06 11:01:45 +01:00
aea9d6ae36
resolved conflicts with containers and added mr12
2018-02-06 09:21:07 +01:00
a149b3119e
Final Wizard without js, view list, cluster creation - #1748
2018-01-23 15:34:44 +01:00
099cd3bbe8
Wizard first and second step, clusters functions - #1478
2018-01-17 18:56:44 +01:00
cce92cc961
Clusters creator main page, fix pandoradb - #1748
2018-01-16 19:24:58 +01:00
749bc20018
Add db changes to pandora_migrate - #1748
2018-01-16 16:02:20 +01:00
5ab43d8106
Add menu section, new db tables and two new module types in pandoradb
2018-01-16 15:41:35 +01:00
934ab8ed91
Add support for periodically updating the status of unknown modules.
2018-01-11 16:00:22 +01:00
e2ee8a555d
add fullscale container graph
2018-01-03 15:53:49 +01:00
ead1161e0b
add fullscale combined and custom graph
2018-01-03 12:13:00 +01:00
9a0438bc36
Merge branch 'develop' into 1611-No-se-envían-los-informes-por-correo-desde-Metaconsola-4881-vodat
...
Conflicts:
pandora_console/extras/mr/10.sql
2018-01-02 16:56:48 +01:00
0b5678fba6
add new funtionality view favourite console visual
2017-12-28 15:13:06 +01:00
d0d0f8b229
Fix custom graph builder order bar - #1382
2017-12-13 13:08:41 +01:00
61b33221bf
Added check modules and series
2017-12-13 10:37:23 +01:00
afcd03658e
Fix sending mails for reports an templates reports by cronjobs - #1611
2017-12-05 11:40:41 +01:00
236012bdd8
Db changes for clocks in visual console - #1403
2017-12-01 12:56:32 +01:00
ac06725d99
Merge branch '1326-Crear-un-checkbox-para-que-no-se-muestren-datos-vacíos-en-los-informes-open-db' into 'develop'
...
Apply db changes to hide no data field event template reports - #1326
See merge request artica/pandorafms!941
2017-11-30 13:31:48 +01:00
3390dc7c24
Merge branch '1382-Ordenar-elementos-custom-graphs-4606-db' into 'develop'
...
Db changes for tgraph_source field order - #1382
See merge request artica/pandorafms!965
2017-11-30 13:12:31 +01:00
688736288c
Change treport_content_template fileds order - #1326
2017-11-30 12:46:29 +01:00
097bc39d74
Merge branch 'develop' into 1326-Crear-un-checkbox-para-que-no-se-muestren-datos-vacíos-en-los-informes-open-db
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb.sql
2017-11-30 12:28:21 +01:00
89c08ede12
Merge branch '1351-AND-filters-added-to-snmp-filters-(so-much-wow)-dev' into 'develop'
...
1351 and filters added to snmp filters (so much wow) dev
See merge request artica/pandorafms!978
2017-11-29 14:07:58 +01:00
897d7bf258
Added type graph selection in container graph
2017-11-23 18:01:32 +01:00
ede677f07c
Added safe_mode_module in metaconsole
2017-11-16 13:38:59 +01:00
ec48829c71
[DB] Added a missing coma
2017-11-16 10:55:01 +01:00
f2ad76636c
Merge branch 'develop' into varias-consolas-visuales-en-un-solo-dashboard-modo-slideshow-opcional
...
Conflicts resolved:
pandora_console/extras/mr/9.sql
2017-11-16 09:49:11 +01:00
8fa2acfd2a
Merge branch 'develop' into 1313-Poder-elegir-posición-en-consola-visual-4517-2
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/reporting/visual_console_builder.editor.js
pandora_console/pandoradb.sql
2017-11-15 17:35:51 +01:00
8d42f7fec1
Update pandoradb.sql
2017-11-15 16:08:38 +01:00
776aca90d6
Merge branch 'develop' into 1505-acl-de-grupos-para-los-elementos-de-la-consola-visual-dev
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/reporting/visual_console_builder.editor.js
pandora_console/include/ajax/visual_console_builder.ajax.php
pandora_console/include/functions_visual_map_editor.php
pandora_console/pandoradb.sql
2017-11-15 09:43:33 +01:00
b12d529578
Merge branch '1276-Cascade-protection-a-nivel-de-módulo-dev' into 'develop'
...
1276 cascade protection a nivel de módulo dev
See merge request artica/pandorafms!933
2017-11-15 09:31:05 +01:00
90b99c491a
Merge branch '1509-calculo-de-estado-en-consola-visual-mediante-el-peso-de-su-padre-dev' into 'develop'
...
Added new system of calculate status if user set a parent weight
See merge request artica/pandorafms!1043
2017-11-15 09:28:10 +01:00
3493b9c15c
Revert "code backup"
...
This reverts commit b9851a3a71
2017-11-13 10:21:38 +01:00
fac066debd
Added groups acl in all visual console elements
2017-11-08 15:01:44 +01:00
c9d1fab036
Added new system of calculate status if user set a parent weight
2017-11-08 12:49:03 +01:00
594b6e9417
Merge branch '1320-Exportación-CSV-saca-entities-dev' into 'develop'
...
1320 exportación csv saca entities dev
See merge request artica/pandorafms!1007
2017-11-02 15:35:38 +01:00
b9851a3a71
code backup
2017-10-31 11:51:19 +01:00
96b3ebc67a
Change pandoradb treport_content_template and treport_content fields - #654
2017-10-30 17:27:37 +01:00
f608c686b8
Graph and table mode for max, min and avg reports an template reports - #654
2017-10-30 17:23:59 +01:00
8163200f54
Revert "Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop'"
...
This reverts merge request !871
2017-10-30 16:11:58 +01:00
65ae5ed2eb
Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop'
...
Graph and table mode for max, min and avg reports and template reports - #654
See merge request artica/pandorafms!871
2017-10-30 15:51:51 +01:00
49a1f7d872
Merge branch '1459-Campo-para-establecer-el-tiempo-de-autorefresco-dev' into 'develop'
...
Added time autorefresh
See merge request artica/pandorafms!945
2017-10-30 10:58:07 +01:00
7bd6f5e05d
Added code to snmp filters form
2017-10-25 15:45:19 +02:00
7e6adb5d40
Db changes for tgraph_source field order - #1382
2017-10-24 19:02:16 +02:00
ea51df8b20
Add show on top option to all visual console elements - #1313
2017-10-23 18:54:57 +02:00
f6e012e0fa
Added time autorefresh
2017-10-23 13:17:06 +02:00
cb7390371c
Replace the index data_index1 on tagente_datos with a composite index.
...
Agent data is always searched by agent id and utimestamp. A composite
index makes queries on tagente_datos a lot faster. pandora_db.pl can
still use the existing index on utimestamp. Ref pandora_enterprise#1485.
2017-10-23 09:21:57 +02:00
c9ff9e77a3
Apply db changes to hide no data field event template reports - #1326
2017-10-18 18:22:00 +02:00
b641323eed
[ artica/pandora_enterprise#1462 ] Added the DB changes needed by the dashboard items slideshow feature
2017-10-18 17:29:06 +02:00
74308ae42b
Created Safe operation mode
2017-10-17 16:58:05 +02:00
788265713e
Graph and table mode for max, min and avg reports an template reports - #654
2017-10-02 18:23:26 +02:00
enriquecd
vgilc
danielmaya
Ramon Novoa
daniel
Alejandro Gallardo Escobar
Enrique Camargo
Arturo Gonzalez