05c6e82e93
WIP: netmap
...
Former-commit-id: 9d269c2829df2c2e4eaddb7432ff1071ee1adb3a
2019-03-06 16:30:40 +01:00
825128e31e
WIP: minor updates in notification wrapper
...
Former-commit-id: 1dd6fcf1ca43cc9d3b0c633c7bd6487240c2b5bf
2019-03-05 19:10:44 +01:00
63ee3b0329
wip: style checks
...
Former-commit-id: 527c939420f9790b7b0850a207dd5221721986fd
2019-03-05 19:02:23 +01:00
70e4e86cdf
Merge remote-tracking branch 'origin/ent-3432-Nueva-cabecera-y-menu-lateral' into ent-3595-discovery-fase-2
...
Former-commit-id: ba98fda78052b11f7bb579cf84d5e29e557e68ac
2019-03-05 18:58:26 +01:00
c03631ec9b
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 1e68380f62f61e9ac895a0c2bade2e6c8f5b589f
2019-03-05 18:56:14 +01:00
63cd5fe018
Merge branch 'ent-3530-SNMP-event-graph-not-working' into 'develop'
...
Fixed width unit on graph, setted to px instead of %
See merge request artica/pandorafms!2234
Former-commit-id: 52caaa0de71150e62616b363471aa4bafadf4fcb
2019-03-05 18:06:45 +01:00
5c65f2541d
Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
...
Former-commit-id: 12579e897dc21339580e7b52f4de593714431c58
2019-03-05 16:48:41 +01:00
0548fdd95f
Change english strings
...
Former-commit-id: 47d1b455f4997ce7b63672678aaeb42a8205e957
2019-03-05 16:48:27 +01:00
4c0263206e
WIP: Networkmap & recon improvements
...
Former-commit-id: 25e6fb140f4cf52e919eed941b6659ed377ac26c
2019-03-05 16:12:29 +01:00
e26c81aa6c
Fixed images and reset map in networkmap
...
Former-commit-id: d56dc68d542aa1e4d30a3014acc53b44dc07191e
2019-03-05 15:33:27 +01:00
9d29af2af5
add new field for table treport_content
...
Former-commit-id: f8cc4544e68a1369a1b0a34b82a506430b3503b8
2019-03-05 15:15:48 +01:00
da0f0b492a
Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
...
Former-commit-id: dbfc5603652eacc4214e6503b5603bd79f834984
2019-03-05 15:06:18 +01:00
09897591c3
Add extended events to event reporting tables
...
Former-commit-id: afbf41109bc382c6b26cb0e6b97d5dc3d580c256
2019-03-05 15:03:05 +01:00
6bc73b54cb
Merge branch 'ent-3529-7431-conteo-de-agentes-deshabilitados-en-metaconsola' into 'develop'
...
Fixed downtimes disabled and enabled agents
Closes pandora_enterprise#3529
See merge request artica/pandorafms!2205
Former-commit-id: dc624b9b6f73ca1a56527c71ba4b0495ad219aaa
2019-03-05 14:43:10 +01:00
590accf90c
Merge branch 'ent-3403-Pantalla_en_blanco_con_credenciales_erroneas_en_config_php' into 'develop'
...
Added new alert when failed database
See merge request artica/pandorafms!2229
Former-commit-id: b2fef57a8988766b75c048542c746977f03aba4e
2019-03-05 13:42:33 +01:00
033eb2ff7c
Fixed problem with install.php #3432
...
Former-commit-id: 7b1ac63e6a032fe2b1511c15e783fc5bbb6ac537
2019-03-05 13:33:29 +01:00
35633d181b
Merge remote-tracking branch 'origin/develop' into ent-3432-Nueva-cabecera-y-menu-lateral
...
Conflicts:
pandora_console/install.php
Former-commit-id: 32eb8fd266b43ce01a297044da9117e8d48b64a6
2019-03-05 13:20:59 +01:00
054bc070f7
WIP review netmaps
...
Former-commit-id: 167c0fa7aacf7b3e916e9572faf43e32eee116dc
2019-03-05 13:19:03 +01:00
7be5d3e9e0
new header and menu
...
Former-commit-id: 7a36ca23fc302cf3b86dca26971ce591107b66e8
2019-03-05 12:54:11 +01:00
f817a94609
Merge branch 'ent-3319-ldap-save-password-conf-not-saving' into 'develop'
...
Fixed ldap conf tooltips
See merge request artica/pandorafms!2238
Former-commit-id: 355e217947287e500ea146a8f3777ec1cb3bc219
2019-03-05 10:34:15 +01:00
2ceba76d22
Fixed ldap conf tooltips
...
Former-commit-id: 957a6c1d90ce99630fa2327c829f178561192a50
2019-03-05 09:09:24 +01:00
930c527ad2
Auto-updated build strings.
...
Former-commit-id: 2bf7188690fce3ac4ff2b8d124b552f6a6f7d608
2019-03-05 00:01:26 +01:00
d89e3993e7
WIP first tasks
...
Former-commit-id: 4fbdab2389d5727c44693b129baa4ceadc6934ae
2019-03-04 20:02:35 +01:00
ab453fde68
WIP: event extended reports
...
Former-commit-id: ad01e92854f766c1a1f35103807b8974c90720a2
2019-03-04 19:06:15 +01:00
92974c71d9
Merge branch 'ent-3595-discovery-fase-2' of brutus.artica.lan:artica/pandorafms into ent-3595-discovery-fase-2
...
Former-commit-id: d6708f1ea30390850ca133f8bd474e177863b016
2019-03-04 16:43:55 +01:00
756fdd2cd4
minor fix in supervisor - server status global counter
...
Former-commit-id: f34daeb57a442b7f3b299e3d72d40317b0e9e0c0
2019-03-04 16:43:48 +01:00
1f1c9de887
changes in default values in networkmap
...
Former-commit-id: 650abcc24fc19e565b9737e80e602f7188114148
2019-03-04 15:31:07 +01:00
9fd391a819
Make always basic checks while browsing pandora
...
Former-commit-id: db93bfdaa674cd2d632153825c37a8a41152dc2c
2019-03-04 14:57:57 +01:00
5e496d0d7a
Fixed url target in Supervisor
...
Former-commit-id: 4e69ec7a157d8bceb3cbfc88c52a886a4353dc0e
2019-03-04 14:52:57 +01:00
1cfabda53e
Merge branch 'ent-3224-7026-anadir-token-agent-name-as-alias-a-importacion-de-agentes-por-csv' into 'develop'
...
Modified agents_create_agent to permit create agents with name as alias
See merge request artica/pandorafms!2209
Former-commit-id: ef47fc540cedd0c06b58805a3fb162d5807ecc32
2019-03-04 13:22:56 +01:00
12a287f322
Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into ent-3432-Nueva-cabecera-y-menu-lateral
...
Conflicts:
pandora_console/godmode/setup/setup_visuals.php
pandora_console/install.php
Former-commit-id: 1c1a318ae74ab3a363a88d99cc079eea6e213171
2019-03-04 09:52:05 +01:00
36fa0fc41f
new header and menu
...
Former-commit-id: d1e8fbd044711f87b75177c32225be7847b60018
2019-03-04 08:39:56 +01:00
3ed6a2b089
Auto-updated build strings.
...
Former-commit-id: d8e95284d6eded43b5d1af26b172a034a06d3bed
2019-03-04 00:01:22 +01:00
62c7e8dffc
Auto-updated build strings.
...
Former-commit-id: dd2dc5dcc124d58611076b2e38dd65a596c23f3b
2019-03-03 00:01:24 +01:00
b194d439d2
Auto-updated build strings.
...
Former-commit-id: 8081bea8a9b82eca462bc1ae7b600162a08faea6
2019-03-02 00:01:29 +01:00
41138fbfbb
discovery tasks assimilate cron
...
Former-commit-id: d373a07b50f6ba8ac106dbeee4a84d9a0635464f
2019-03-01 15:26:05 +01:00
d4b79179d9
Fixed width unit on graph, setted to px instead of %
...
Former-commit-id: 2517a1bfad9c609709f30025c2d6927c0011ade1
2019-03-01 14:58:41 +01:00
a5c3136321
Merge branch 'ent-3621-Discover-vista-de-tasks-bloqueada-y-duplicada' into 'develop'
...
fix discover task view
See merge request artica/pandorafms!2223
Former-commit-id: f8c236623756ef6e76d54cf4ab905f706df1ea84
2019-03-01 12:16:08 +01:00
adb25e91f8
Merge remote-tracking branch 'origin/ent-3621-Discover-vista-de-tasks-bloqueada-y-duplicada' into ent-3595-discovery-fase-2
...
Former-commit-id: 157ed627078c5e6cfedd6ed9d509a339cdb01632
2019-03-01 11:09:11 +01:00
b4170ca285
minor fixes, removed tuser_task_scheduled from tasklist, also cde over ipam references
...
Former-commit-id: 46be3614b9aeb9837748149a805427d68a07f566
2019-03-01 11:08:49 +01:00
d547024274
fixes non-enterprise components
...
Former-commit-id: c22cec27d981c119531a0049469847b9d1a848eb
2019-03-01 09:51:16 +01:00
ed9b736299
Merge remote-tracking branch 'origin/ent-3621-Discover-vista-de-tasks-bloqueada-y-duplicada' into ent-3595-discovery-fase-2
...
Former-commit-id: 9dcad6195eb21f84d90b570828791338ff069ddd
2019-03-01 09:50:09 +01:00
42d8e72400
Recovered the lost code for the current user macro at the event responses.
...
(cherry picked from commit d554dcc7db
2019-03-01 09:40:36 +01:00
8fc432b934
Auto-updated build strings.
...
Former-commit-id: 818dfe6138fe1837c87d96d607b15e51e06336cb
2019-03-01 00:01:32 +01:00
7e53461b94
Added new alert when failed database
...
Former-commit-id: ee0e8efaf3f32b4c5a86d421873555969274ca43
2019-02-28 17:40:11 +01:00
46089b31a8
Merge branch 'develop' into ent-3594-Unificacion-de-tamaños-de-checkbox-switch
...
Conflicts:
pandora_console/install.php
Former-commit-id: 3dee86da8f6b6b1c2caa5e6e1529acd7f60c1433
2019-02-28 13:36:18 +01:00
52d6dfe815
fix discover task view
...
Former-commit-id: 5475d6be802cd4e7280d12aed6f8f91f7833ed98
2019-02-28 12:00:43 +01:00
a8a9a9d620
Auto-updated build strings.
...
Former-commit-id: 2c0ee9351e5f306085921bde697a1b10de102b2e
2019-02-28 00:01:32 +01:00
ec5c9d7c27
clippy returns
...
Former-commit-id: b9ed010f5af1002593471a0d0298848b3593e41e
2019-02-27 13:41:26 +01:00
e55e47cbfa
change mr
...
Former-commit-id: 4ec37be9caef34e88b3e5ca65bca2c1aee7f03dd
2019-02-27 11:35:00 +01:00
fbsanchez
Alejandro Fraguas
alejandro-campos
Daniel Maya
Daniel Rodriguez
Tatiana Llorente
Luis Calvo
artica
Alejandro Gallardo Escobar
samucarc
manuel
daniel