tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
29,635 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

991 Commits

Author SHA1 Message Date
fbsanchez 3150df98c6 Error fix in report - automatic combined graphs 2022-02-17 11:02:23 +01:00
fbsanchez af45aec166 reporting_label_macro general review 2022-02-16 14:01:23 +01:00
fbsanchez 4d912fbd34 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-11 09:55:34 +01:00
fbsanchez 6bb754d5d2 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/pandoradb.sql
 2022-02-08 13:02:22 +01:00
José González fc4b702db0 Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs' 
# Conflicts:
#   pandora_console/godmode/alerts/configure_alert_template.php
 2022-02-08 11:35:01 +00:00
Daniel Rodriguez 3fbbaf031c Merge branch 'ent-8273-modificar-item-last-value-en-reports' into 'develop' 
Report item last value shows last value on selected interval

See merge request artica/pandorafms!4660
 2022-02-07 17:22:11 +00:00
fbsanchez 838b6b30e9 php8 compatibility review 2022-02-07 14:32:59 +01:00
fbsanchez aa2b08f516 php8 incompatibility fixes 2022-02-07 13:35:00 +01:00
Calvo 7fc62b4a2c Fix last value meta and status bug 2022-02-02 18:11:53 +01:00
Calvo fd75b5360f Last value report meta with date before 2022-02-02 10:32:46 +01:00
fbsanchez 592df1c3a7 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/pandoradb.sql
 2022-02-01 15:16:21 +01:00
José González 36bef528ab Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs' 
# Conflicts:
#   pandora_console/godmode/massive/massive_delete_agents.php
 2022-02-01 12:45:17 +00:00
Jose Gonzalez 40efaa157d Merge remote-tracking branch 'origin' into ent-8422-Revision-completa-audit-logs 2022-02-01 13:42:30 +01:00
Jose Gonzalez d81e6571ec New audit logs 2022-02-01 13:39:18 +01:00
Calvo 83d490df5d Last value report meta with date before 2022-01-31 19:27:27 +01:00
Daniel Maya 152b19d937 Fixed inversal interval with string module 2022-01-27 16:58:29 +01:00
Calvo 615304712f Report item last value shows last value on selected interval 2022-01-27 14:05:36 +01:00
fbsanchez 1207463f16 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/include/class/HTML.class.php
 2022-01-25 14:16:47 +01:00
Daniel Barbero Martin 6be6b1a95d add new macros #3763 2022-01-19 12:18:23 +01:00
Daniel Barbero Martin 4f46da6633 Merge remote-tracking branch 'origin/develop' into ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma 
Conflicts:
	pandora_console/include/styles/pandora.css
 2022-01-18 10:17:19 +01:00
fbsanchez 2aad6404a2 php8 with php72 support 2022-01-13 13:48:25 +01:00
fbsanchez 32c0229966 php8 review 2022-01-13 12:43:55 +01:00
fbsanchez 8e5a0917ba php8 review + pdf images b64 fix 2022-01-12 19:43:33 +01:00
fbsanchez fee3f4ab96 php8 review + mdpf update 2022-01-12 14:22:16 +01:00
alejandro.campos@artica.es 5749eda8c3 include historic db data in report 2022-01-11 09:13:25 +01:00
Daniel Rodriguez c7fa90d84a Merge branch 'ent-8383-vodat-Automatic-combined-graphs-no-funcionan-bien-plantillas-de-informe' into 'develop' 
fixed automatic graph templates reports #8383

See merge request artica/pandorafms!4587
 2021-12-27 10:25:49 +00:00
Jose Gonzalez 7ea195c9c7 WIP: Setted graph_image_height 2021-12-22 11:06:11 +01:00
Daniel Barbero Martin 2431067e2c fixed automatic graph templates reports #8383 2021-12-15 15:13:33 +01:00
Daniel Barbero Martin f705cc0fba wip chart histogram list modules #8222 2021-12-14 13:21:34 +01:00
fbsanchez f852df2f1c Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-14 11:03:04 +01:00
Daniel Barbero Martin ffc3728f2a fix minor error 2021-12-07 15:50:34 +01:00
Daniel Barbero Martin 94bd55fd39 wip reports alert actions 2021-12-02 16:55:53 +01:00
Daniel Barbero Martin 751cb7380b wip reports alert actions 2021-12-02 13:52:56 +01:00
Daniel Barbero Martin 9b79fb826d wip reports alert actions 2021-12-02 13:34:28 +01:00
Daniel Barbero Martin 40fc8c7308 wip reports alert actions 2021-11-30 13:07:37 +01:00
Daniel Barbero Martin e8bf86a789 wip reports alert actions 2021-11-29 17:55:09 +01:00
fbsanchez 19643cd685 report for ncm simple 2021-11-29 15:26:19 +01:00
Daniel Barbero Martin dae6182ef0 wip reports alert actions 2021-11-25 17:28:00 +01:00
Daniel Barbero Martin 7a5f91188b Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 
Conflicts:
	pandora_console/include/functions_html.php
 2021-11-24 08:39:03 +01:00
Daniel Rodriguez c5a86e2782 Merge branch 'ent-7916-Macro-de-agentgroup-en-label-de-informes' into 'develop' 
Ent 7916 macro de agentgroup en label de informes

See merge request artica/pandorafms!4489
 2021-11-15 11:28:44 +00:00
Daniel Rodriguez 650607067e Merge branch 'ent-7688-conteo-monitores-vista-tactica' into 'develop' 
Include modules not init in total monitors count on tactical view

See merge request artica/pandorafms!4309
 2021-11-15 11:00:07 +00:00
Daniel Rodriguez c8a808936a Merge branch 'ent-7895-12309-Fallo-visualizacion-item-Incremental-en-informes' into 'develop' 
fix data representation

See merge request artica/pandorafms!4491
 2021-11-15 10:37:40 +00:00
Daniel Barbero Martin e70ecd461e WIP new report alert fired actions 2021-11-12 13:11:49 +01:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
Jose Gonzalez c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
fbsanchez a5bf72cca0 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/include/constants.php
	pandora_server/lib/PandoraFMS/Tools.pm
 2021-10-26 14:21:40 +02:00
alejandro.campos@artica.es 77aba53c7e fix data representation 2021-10-20 15:26:16 +02:00
Daniel Maya 30d1e3ec23 #7916 Fixed group name 2021-10-20 13:09:47 +02:00
Jose Gonzalez 6deaee84ac Merge 2021-10-04 10:00:15 +02:00
alejandro.campos@artica.es 675e64d8ca fix in threshold calculation 2021-10-01 09:06:41 +02:00