9b0defdc34
Merge branch 'ent-4075-Bug-Tactical-view-en-dashboard-publico-cuando-no-hacemos-login_2' into 'develop'
...
Fixed bug showing total events in tactical view on dashboard - #4075
See merge request artica/pandorafms!2509
2019-07-01 09:39:05 +02:00
265202f1ed
Merge branch 'ent-4136-button-styles' into 'develop'
...
Review 1
See merge request artica/pandorafms!2470
2019-06-20 16:35:12 +02:00
174db17a05
remove entities from reports
2019-06-19 12:33:11 +02:00
24025ebb74
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
2019-06-18 17:48:03 +02:00
d39be510cf
Remove entitites to availability reports
2019-06-18 14:03:51 +02:00
dd78326a4c
Remove entities from json reports
2019-06-18 13:38:22 +02:00
4d287a6f36
Fixed bug showing total events in tactical view on dashboard - #4075
2019-06-17 12:31:20 +02:00
8092528742
Fixed reports export to csv meta bugs
2019-06-10 12:27:43 +02:00
e1eac631c1
tactical icon sizes
2019-06-04 15:42:27 +02:00
d64e2cfb8c
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-28 18:05:33 +02:00
9a12b34847
Updates styling
2019-05-28 12:13:29 +02:00
a3591b799a
Merge branch 'ent-3983-Informes-SLA-mensuales-de-keepalive-no-se-calculan-bien' into 'develop'
...
fix minor bug in reporting functions
See merge request artica/pandorafms!2460
2019-05-28 12:03:55 +02:00
f57915285f
review styles agent view
2019-05-27 22:36:55 +02:00
5be124f315
Styles review
2019-05-27 19:00:48 +02:00
58d0dc5dbc
fix minor bug in reporting functions
2019-05-27 18:31:20 +02:00
f5586d7b70
Merge branch 'ent-3630-7648-7712-campo-label-no-se-muestra-en-informes-de-graficas' into 'develop'
...
fixed label reports and more fixed
See merge request artica/pandorafms!2413
2019-05-24 10:47:15 +02:00
1386a44e07
fixed errors label report
2019-05-23 17:52:28 +02:00
a898fad2c3
lint fixes
2019-05-20 10:35:46 +02:00
e981edfa89
fixed label reports and more fixed
...
Former-commit-id: a71c341fc7f6f182f7d847911a7dc4e0cd6f36f7
2019-05-09 16:26:38 +02:00
1644b492d2
fixed errors pdf SLA Weekly
2019-05-08 18:29:33 +02:00
ac101af72f
Merge branch '3631_Unidades_no_se_muestran_en_informes_de_graficas_combinadas' into 'develop'
...
Added module units in module graphs
See merge request artica/pandorafms!2237
2019-05-08 16:36:43 +02:00
596e760454
fixed error secondary groups
...
Former-commit-id: 758cebf4ad68e24e86739d8be21dd90e2cc44847
2019-04-24 17:28:55 +02:00
781a6702ad
Merge branch 'ent-2232-Checkbox-Opciones-para-los-informes' into 'develop'
...
Custom fields in availability report type
See merge request artica/pandorafms!2324
Former-commit-id: 66fca18bc387db638fb9ee39c5f21bc5ec1b2069
2019-04-05 13:01:09 +02:00
49c913c6de
Added custom fields to report templates
...
Former-commit-id: 525d21d17835a3bb08f47df273128e658a35bcd9
2019-04-04 17:31:11 +02:00
ccf0192547
Merge branch 'ent-3731-Bug_en_reports_SLA_mensual' into 'develop'
...
fixed SLA weekly hourly and monthly
See merge request artica/pandorafms!2271
Former-commit-id: 1335616814937252d57028905596ec3083d2464f
2019-04-03 14:23:22 +02:00
2afc16c8dc
Merge branch 'ent-1901-Enviar-reportes-por-mail-en-otros-formatos-que-no-sean-PDF' into 'develop'
...
Ent 1901 enviar reportes por mail en otros formatos que no sean pdf
See merge request artica/pandorafms!2272
Former-commit-id: 590eddf946623393d02a8c88db33fde2af022937
2019-04-01 17:51:37 +02:00
2711eb59ea
Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb.sql
Former-commit-id: 29c3e96f3022c59a9252849c2adeb29182476395
2019-03-25 09:20:06 +01:00
da684fecd2
fixed sla status in graph monthly weekly hourly
...
Former-commit-id: 8cd977e5f1b69c199fc1a5cb2cf405715bd4b4b1
2019-03-25 09:04:22 +01:00
bc9192b98a
[Netflow] Merge three reports in one
...
Former-commit-id: 1a7fb1aaacda5009ba2ab911dc69594133517f91
2019-03-19 17:33:39 +01:00
6121c2a32b
Added types reports to send email
...
Former-commit-id: 7d2f349c47d81de454cb5464146d4f0ac2fc3fb6
2019-03-19 17:16:31 +01:00
df85b0f700
fixed SLA weekly hourly and monthly
...
Former-commit-id: 9c04c8f55b080d6d12f3b3868e7d96660db76470
2019-03-19 16:09:59 +01:00
60870efad6
[Netflow live] Removed aggregate and resolution from report content and move to header subtitle
...
Former-commit-id: 205e5f8ff7633016fe83667b2fc237bc1bdae03f
2019-03-18 10:54:37 +01:00
b660da6e84
Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/install.php
Former-commit-id: dda11929acf5f741e0a4d290b4607ae72683284b
2019-03-14 10:49:16 +01:00
750c64fbd7
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 8dd2601c41392e8b252b2a719d16deef5b6398c7
2019-03-13 09:52:00 +01:00
00eb2766a9
Fixed labels in automatic combined graphs
...
Former-commit-id: f91777c30da55edc43d021b87cda2c0105626f64
2019-03-05 18:06:50 +01:00
09897591c3
Add extended events to event reporting tables
...
Former-commit-id: afbf41109bc382c6b26cb0e6b97d5dc3d580c256
2019-03-05 15:03:05 +01:00
f9b14072d8
Moved report nt_top_n requesting data to functions_network
...
Former-commit-id: a117a63c1b23c0104ffadb2741d049f02a81d6d4
2019-03-04 12:49:18 +01:00
02ff69ea0b
fixed errors SLA With planned downtime
...
Former-commit-id: 7350d33d917f967ea624e4763ed816af97c0743a
2019-03-01 12:34:34 +01:00
4930968ec9
Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.item_editor.php
pandora_console/godmode/reporting/reporting_builder.php
pandora_console/include/functions_reporting.php
pandora_console/include/functions_reporting_html.php
pandora_console/include/functions_reports.php
Former-commit-id: 0d4a8390a47b61520aca2637bb500ff8013495fa
2019-02-21 17:21:42 +01:00
efd65edefa
fixed errors
...
Former-commit-id: dc70e23da17691f3af6602cd85e2f01b27d27d58
2019-02-18 13:13:17 +01:00
f91635c67c
fixed errors in pdf reports
...
Former-commit-id: fbc3598ab2dfd11cc2bfa850ba49b3e35481218d
2019-02-14 07:46:19 +01:00
eeb5f0e296
Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF
...
Conflicts:
pandora_console/include/functions_reporting_html.php
pandora_console/install.php
Former-commit-id: 8f8f95cebc06d0a6802c6a7204a942658efa21f0
2019-02-13 08:02:46 +01:00
99c0da3a06
Merge branch 'develop' into ent-3121-Report-tipo-general-salida-de-datos-booleanos
...
Conflicts:
pandora_console/include/functions_reporting.php
pandora_console/include/functions_reporting_html.php
Former-commit-id: 10d4c89ad8c6a124c9f31634dc4183e7380d49d7
2019-02-11 11:11:56 +01:00
20e0508e01
fixed pdf report
...
Former-commit-id: 515b8f06f3584c6aaa1a32ea29a2f555e7afccad
2019-02-04 12:10:52 +01:00
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
ac3792690c
Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Former-commit-id: 311dc42f717a4419371d0de20c048bd5e0a9cd00
2019-01-30 12:04:56 +01:00
78fd6850e7
Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_server/lib/PandoraFMS/DataServer.pm
Former-commit-id: 423e2d818730f97ef1ed0a286f717243731b5363
2019-01-29 18:15:59 +01:00
f2cee941c7
Fixed Network traffic sent title
...
Former-commit-id: 5d23b96119fae2d03f23e47a304d85b902324a89
2019-01-29 17:45:19 +01:00
cc27f0451a
Fixed auto combined graph in metaconsole 2
...
Former-commit-id: 672531931421175354f2a877ac295c1763107756
2019-01-29 17:12:24 +01:00
d7b25fa65d
Added nt top N HTML report
...
Former-commit-id: b9151e9eb32f6da305cb9b061746ecbe7c8cb763
2019-01-29 15:47:20 +01:00
Alejandro Fraguas
Daniel Rodriguez
marcos.alconada
fbsanchez
Tatiana Llorente
Luis Calvo
alejandro-campos
Daniel Barbero Martin
manuel
fermin831
samucarc
artica
Daniel Maya