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
9d7c6854a8
fixed error in snmp browser change server
...
Former-commit-id: 0545012dd8526bdf4cc836af2d263af7b5ca5328
2019-03-04 15:33:36 +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
488be0d602
Changed radio buttons by checkbox switch
...
Former-commit-id: f0c64cecbf9e1197be08a9a95248d3b4ea8bd949
2019-03-04 13:12:01 +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
c5a5df01f6
add tip SLA Services
...
Former-commit-id: da452d98c0b3b43d36c4c53de70df762f6530c8d
2019-03-01 14:26:25 +01:00
fadf75a626
fixed minor error lenght str.warning and str.critical 1024 charts
...
Former-commit-id: c7c32a48731eff5c786bd0710652a31a64364861
2019-03-01 13:36:38 +01:00
02ff69ea0b
fixed errors SLA With planned downtime
...
Former-commit-id: 7350d33d917f967ea624e4763ed816af97c0743a
2019-03-01 12:34:34 +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
fb40ef7ce4
Changed Maintainer in pandorafms-agent-unix
...
Former-commit-id: c0bff759d2926ec1459e66205b3918ec3d02d3f4
2019-02-28 17:12:31 +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
cefaccb651
Fixed synchronize collections in node
...
Former-commit-id: d48015ff7c41298fa87cbb5cf1f298beac501719
2019-02-28 13:02:59 +01:00
95b5c4ad01
add new macro for alert events
...
Former-commit-id: 08c5bf0168bcd5d9c23a23443187870269d61a40
2019-02-28 12:30:01 +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
0a37f6d848
add changes to migrate script
...
Former-commit-id: 7e1beeed2a8ff709cdd2e2ff992b610cd4aa7409
2019-02-27 11:32:39 +01:00
26560c734c
Updated version and build strings.
...
Former-commit-id: 39df6ee0aee9f29c9afb8729f9e95b316ca8cd67
2019-02-27 11:25:50 +01:00
8780571a74
add new functionality in event response
...
Former-commit-id: 2cf28b95c068c40e79b8f05b212aad0f720de79b
2019-02-27 10:59:44 +01:00
9f92f3f010
Fixed
...
Former-commit-id: 4fc7d9a22dd2a59501cd7ffc7539c431d37512a8
2019-02-27 10:35:40 +01:00
8f24c0cb18
Fixed conflict in CLI apply_policy
...
Former-commit-id: ab512d9c2b88cd7042d6ae065251cd116b2ea5af
2019-02-27 10:28:36 +01:00
75b889ff4a
Merge branch 'ent-3430-proyecto-discovery' into 'develop'
...
Ent 3430 proyecto discovery
See merge request artica/pandorafms!2210
Former-commit-id: 104df0b898d6f4bb9eef21005cca6a3f74c3e035
2019-02-27 10:02:14 +01:00
e18eaaf415
Merge branch 'ent-3287-sincronizacion-plugin-de-servidor' into 'develop'
...
Ent 3287 sincronizacion plugin de servidor
See merge request artica/pandorafms!2199
Former-commit-id: 2153828c0deb35bd72dd6b39612c947b56782c40
2019-02-27 09:58:42 +01:00
65b89f6688
Auto-updated build strings.
...
Former-commit-id: 59e3d47f8cc8c9fedb86f0ba6fd7fe183cb908b8
2019-02-27 00:01:47 +01:00
7ed3252ca5
minor fixes
...
Former-commit-id: 75b33343bed508ff3ff136fa0fedc5d9d8c952be
2019-02-26 20:23:52 +01:00
24a1adfb9f
minor fix
...
Former-commit-id: 6729d11217d0fecb7b64283b6e4d0485b9bdfdc8
2019-02-26 20:08:01 +01:00
a8874f9b1b
Minor fixes
...
Former-commit-id: c3abb9964c61f0535ab59644f6eb1d0a8328212a
2019-02-26 20:00:41 +01:00
33235b26d3
Merge branch '3597-Pequeno_arreglo_config_732' into 'develop'
...
fix minor error
See merge request artica/pandorafms!2202
Former-commit-id: fded71effc82a3ffde4d3a003f6f090f9e8e4b9f
2019-02-26 18:19:58 +01:00
0e7c498e1a
Comment updates
...
Former-commit-id: a711916af981c065d26def1943fc526d936de5d3
2019-02-26 17:53:58 +01:00
5382f07ae2
Comment updates in wizard class
...
Former-commit-id: 9fbb1d0c6499dd1ad71c472970b3993193b581da
2019-02-26 17:42:12 +01:00
5b3ce09515
Comment updates in wizard class
...
Former-commit-id: 0b820729a631d906fe4816ba74f84f700b500c01
2019-02-26 17:41:42 +01:00
e19e7d3484
Modified agents_create_agent to permit create agents with name as alias
...
Former-commit-id: 9d3524e2dc02beb92d819cd877b9b44f64154fd5
2019-02-26 17:30:21 +01:00
2c0c050507
Disabled cache in server plugin synchronization
...
Former-commit-id: c8d60db8aece2db8611ee7d8ac44347f661d9b83
2019-02-26 17:20:23 +01:00
d177bda2bd
Merge branch 'ent-3520-7484-Autenticación-por-ldap-no-contempla-la-posibilidad-de-ldaps' into 'develop'
...
Parameter changes deprecated in LDAP
See merge request artica/pandorafms!2168
Former-commit-id: 8cccefd16b2fab4134ddd397b45094936155ceea
2019-02-26 16:57:25 +01:00
441fb979e1
Merge branch 'ent-3210-Nueva-vista-de-servicios' into 'develop'
...
Ent 3210 nueva vista de servicios
See merge request artica/pandorafms!2195
Former-commit-id: f29cb46b83ff0fde722f3c5e3eaf26aedf5cf327
2019-02-26 16:32:34 +01:00
86509caf6b
Fixed downtimes disabled and enabled agents
...
Former-commit-id: a5c2362e4faf6c0ed9ff2047b6d070aa4d7cdac8
2019-02-26 14:44:51 +01:00
7791639b35
fix bad image routes
...
Former-commit-id: 236701131f5c2f5b11c01b878d8a04b71f76ddd3
2019-02-26 13:31:35 +01:00
c886dd1dfa
Merge branch 'develop' into ent-3594-Unificacion-de-tamaños-de-checkbox-switch
...
Conflicts:
pandora_console/include/functions_html.php
pandora_console/include/styles/pandora.css
pandora_console/install.php
Former-commit-id: 5cd5899c222ba13ec9bfa0212e5d2ec580353787
2019-02-26 12:31:37 +01:00
45419fbfb0
Fixed href in plugins with centralized node
...
Former-commit-id: 03fa2c15b7a9fb14cdc12499c3bc2a204bae3cd5
2019-02-26 12:23:46 +01:00
875d7ecaba
Unified sizes of the checkbox switch
...
Former-commit-id: f6f8eca748f67fdf1e4a98256c3ca590b61328ac
2019-02-26 12:04:18 +01:00
34eedc5330
new header and menu
...
Former-commit-id: aac70c14548c725b68fa031202e0b8449b725f45
2019-02-26 11:20:17 +01:00
3e87c8e931
new header and menu
...
Former-commit-id: 975b72219cb07e0d4f9b332607e554bd65ea7cc3
2019-02-26 10:43:59 +01:00
c38ac4b837
Updated breadcrum
...
Former-commit-id: 51c14ea50e6c7d419d610ef1b52c4769214495ef
2019-02-26 10:34:37 +01:00
de7c1ce978
Fixed ACL selection menu wrong sec for visual console
...
Former-commit-id: dd9f4a212f43774c2602932baa0c1a83e3ba6e56
2019-02-26 09:40:04 +01:00
d4c46ec14f
fix minor error
...
Former-commit-id: 81b5c41c49a5e121c5ac34c12bfd5b1b7f5f943a
2019-02-26 08:44:50 +01:00
88202977fa
Auto-updated build strings.
...
Former-commit-id: e3e3a3aba908a64a4743bd8b18337510e0c6e609
2019-02-26 00:01:57 +01:00
11106f9b86
Merge branch 'ent-2835-revision-visor-de-logs' into 'develop'
...
Added models in tlog_graph_models
See merge request artica/pandorafms!2200
Former-commit-id: 33da3ceca68bc25975dd9f62ed24d7ca0c8a01e4
2019-02-25 19:37:49 +01:00
7f47a4504b
Merge branch 'develop' into 'ent-2082-Mejoras-en-selector-de-widgets'
...
# Conflicts:
# pandora_console/extras/mr/25.sql
Former-commit-id: b0781f5c0d3bce0fdd6a35bba4c77a26f8d112ac
2019-02-25 18:47:28 +01:00
4bf7469565
change mr and migrate for table twidget
...
Former-commit-id: fb7bfc3771b2c019a7e70771d4e5bd47043ba99b
2019-02-25 18:42:52 +01:00
13cbc78fdd
change mr and migrate for table twidget
...
Former-commit-id: d7d07f5e036a8dd81debcb974bd42217e2b59b26
2019-02-25 18:41:24 +01:00
16f1474691
Added models in tlog_graph_models
...
Former-commit-id: 76d6f1358677c02eab4681a1bb290fda0476c91b
2019-02-25 17:45:37 +01:00
db5d2ceee1
fix bad routes in services treeview
...
Former-commit-id: 27bfcca5a7e0f7c3929e2a1f449c0f1d318891c9
2019-02-25 17:04:07 +01:00
ac9452583a
Added no data to show to some graphs where id not found
...
Former-commit-id: 1697a482e80521666f679eb18d2f44fc3975e304
2019-02-25 16:50:27 +01:00
b7cc25314d
Unified sizes of the checkbox switch
...
Former-commit-id: 392fdf006c81fb5586349b8a4b4544e0c07aa903
2019-02-25 16:20:05 +01:00
67e53bf7a7
add new way of importing css for treeview
...
Former-commit-id: d88bb38ac7d20ab5f554cfb1399b17ddf6f62fb2
2019-02-25 16:15:17 +01:00
5812a8bdaa
Merge remote-tracking branch 'origin/develop' into ent-3287-Sincronización-plugin-de-servidor
...
Former-commit-id: 93fd236f1876132a18aae31f8ccbcd888a1613f0
2019-02-25 15:43:33 +01:00
d8ee90c285
Merge remote-tracking branch 'origin/develop' into ent-3430-discovery
...
Former-commit-id: cd7b77b0fe8fa41f03024af752b8793ae877de2b
2019-02-25 14:42:48 +01:00
cdca720d9a
minor fix user_edig
...
Former-commit-id: 2e13b75edd5625fa2d1d6d9360d55a19f0992ac0
2019-02-25 14:41:27 +01:00
7f01e47e1f
Merge branch '3281-Vista-monitor-detail-personalizar-campos-a-mostrar' into 'develop'
...
ent-3281-Vista-monitor-detail-personalizar-campos-a-mostrar
See merge request artica/pandorafms!2132
Former-commit-id: bebade5b9cd293eb6f062f5b6fb85aaad673a9b8
2019-02-25 13:48:37 +01:00
504a8e9d1a
fixed warnings php
...
Former-commit-id: d21cb02113c65a7f50a5e29f7f536e85ba5cb945
2019-02-25 13:02:39 +01:00
6ec148c59c
new header and menu
...
Former-commit-id: 4375597f0b77ccc577fa486c409e214a7ba00362
2019-02-25 12:28:41 +01:00
4c92375a58
new header and menu
...
Former-commit-id: 3509107664a968fc358a8bb3e662f27b26b10c73
2019-02-25 12:23:15 +01:00
526311d1c6
new header and menu
...
Former-commit-id: 0748bc89d30e8ae4723026848d493d15d82af9cd
2019-02-25 11:54:46 +01:00
be7eadeb2c
extend status change functionality in monitor detail view custom fields
...
Former-commit-id: e48ae88416f50b47aac79ae28b9b4bcd08ebdf73
2019-02-25 11:32:26 +01:00
1f26a8c4b3
Updated message warnings in Tasklist
...
Former-commit-id: beb870813818ff8a7000ffaac7e09f326f0bf253
2019-02-25 11:30:09 +01:00
4da8f54f84
Updated message warnings in Tasklist
...
Former-commit-id: 9f8324e4f882e14451bda7034b1ff081c14a7a41
2019-02-25 11:29:39 +01:00
510833eaf1
Merge remote-tracking branch 'origin/develop' into ent-3430-discovery
...
Former-commit-id: 418593106602da6aa270905e478e25b50a8f5ebd
2019-02-25 10:47:46 +01:00
9753faa17a
Auto-updated build strings.
...
Former-commit-id: 01fee147745dfd638487449f20211abd8e83b71e
2019-02-25 00:01:36 +01:00
a49f68e96b
Auto-updated build strings.
...
Former-commit-id: ee007a4042fe893b73e088abd7a7b6cd0bdc45d2
2019-02-24 00:01:50 +01:00
797f922748
Discovery Tasklist minor fixes
...
Former-commit-id: 693f181168f74f93ad9a3ce628d0defd9ef72d02
2019-02-23 12:13:54 +01:00
febe2cc3a6
Auto-updated build strings.
...
Former-commit-id: 4f687af81ee7ab9541649e5f395c2e2aaf359609
2019-02-23 00:02:37 +01:00
4289684e00
Cloud Discovery RC1
...
Former-commit-id: 9933be0c76b44592783e686bfa2da9ab63df1022
2019-02-23 00:01:59 +01:00
8b5f50f883
Discovery minor fixes
...
Former-commit-id: 3914d7a99fb70d88c1a1f95d3c2aeb100f277266
2019-02-22 19:18:07 +01:00
4abf19722b
Minor fixes and improvements. Discovery
...
Former-commit-id: d4410ddca6aec18ed28b7b0236ee16a3e8a6d2b8
2019-02-22 18:12:01 +01:00
12b8042c53
Added server plugins in meta
...
Former-commit-id: 7f69f55c3fad06c7b15408d755d088d5ac89b111
2019-02-22 14:26:58 +01:00
2c1eb0fe03
Added aws view menu
...
Former-commit-id: a64079eb5e773d3fe36031bac856aa801728f79d
2019-02-22 14:16:39 +01:00
faae9c58b3
implement services tree view
...
Former-commit-id: a081515f62ab210f96687577bfde60d5f6d23f23
2019-02-22 14:09:27 +01:00
f0c9d16318
fixed errors view discovery task list
...
Former-commit-id: 7e3160cde5c0fa46ee3d918789ffec4091f42c31
2019-02-22 13:45:59 +01:00
1feebae564
removed fullurl supervisor
...
Former-commit-id: 74cc731977477c444150d49aff9ab062ddac065a
2019-02-22 13:33:46 +01:00
eb56fd566c
implemented services treeview
...
Former-commit-id: d5d71442d0c6122ba91b160647559cdf03f55625
2019-02-22 13:07:47 +01:00
3d2bfa95b5
add table console task in discovery
...
Former-commit-id: b13571167c063188102a8473fb57fa63c18bece3
2019-02-22 12:53:35 +01:00
e65d128b25
minor fix db schema
...
Former-commit-id: a4f87c1c7fd9da0f16a37f75cb5029ac6694baef
2019-02-22 12:40:02 +01:00
b1aa0fe2f2
Merge from develop
...
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
2019-02-22 12:30:27 +01:00
35ad2f4bb5
Validations for default values
...
Former-commit-id: a33139b817ece206a611d5f2678b62c876a8e41f
2019-02-22 11:21:38 +01:00
42448cf0d8
Updated path for discovery plugins
...
Former-commit-id: 222373efee3c768619d5f301f3ae291009901e64
2019-02-22 10:41:54 +01:00
e55915e1e2
Merge branch 'ent-3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola' into 'develop'
...
3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola into develop
See merge request artica/pandorafms!2193
Former-commit-id: c6e976b78254e6b5b82dddf206c419737bd99a83
2019-02-22 10:01:43 +01:00
1aa60fd15d
Merge branch 'ent-3511-Bug-en-la-edicion-del-widget-de-tipo-Agent/Module-View' into 'develop'
...
Ent 3511 bug en la edicion del widget de tipo agent/module view
See merge request artica/pandorafms!2190
Former-commit-id: bffc145be0e0eee4265dcdf7d8be2447e467bb79
2019-02-22 09:18:11 +01:00
b1149a053b
Auto-updated build strings.
...
Former-commit-id: f642e8fe029c7df7a017abe433d7768acd8577fd
2019-02-22 00:01:38 +01:00
45bba4faa8
fix agent name input
...
Former-commit-id: 51b7566719392d1cc43ca04a9ec91ae007e73feb
2019-02-21 19:00:47 +01:00
64679ee72e
discovery minor fixes
...
Former-commit-id: 6d7a1a75bcb6844c839f34a2a2bfaf3f96734db8
2019-02-21 18:00:50 +01:00
59159ec473
change last status change info
...
Former-commit-id: e40f4ce7f042219584f0224822ca8a112f453194
2019-02-21 17:22:00 +01:00
a9eb3cf37b
Merge branch 'ent-3458-Metaconsola_filtro_eventos_por_nombre_agente_no_machea_nombres_con_espacios' into 'develop'
...
Fixed filter by name of agents in events when they contain spaces
See merge request artica/pandorafms!2160
Former-commit-id: 725ca1b5279d8074454ae8ed4b3af27f084e9594
2019-02-21 17:07:36 +01:00
9e9d915609
Modified redirection
...
Former-commit-id: 77dd6fee3a71064e790bd020afbcc91edbdfe20c
2019-02-21 15:35:44 +01:00
e856969a59
Minor fix changed vmware_plugin reference to vmware-plugin
...
Former-commit-id: 20e80bfffaf80583c320aa62d35e54f79e6ab03e
2019-02-21 15:13:27 +01:00
36410a26d1
Merge branch 'ent-3436-custom-fields-como-macros-en-el-server' into 'develop'
...
Add support for column macros.
See merge request artica/pandorafms!2182
Former-commit-id: 93dad8f6c54f6e46e5e54dab347a96cffe2fd240
2019-02-21 14:38:21 +01:00
8fb84e910a
Minor SQL fixes discovery
...
Former-commit-id: e2513e61ea6038f0bdb8f009619dcb92f07b992e
2019-02-21 14:29:59 +01:00
1167cfcafc
Minor SQL fixes discovery
...
Former-commit-id: 8d27ac99269f228b7fbb0c46b722bc5ea54c86ab
2019-02-21 14:27:09 +01:00
e32c4025a4
Supervisor. minor fixes
...
Former-commit-id: 036bc6a871db86d7a8925c7d5e2531d9f62ca839
2019-02-21 14:18:33 +01:00
fd77b94f96
Fix regexp Supervisor
...
Former-commit-id: 7dc32dd119ae78a3158e7c5d20bc5f73a8c94d2f
2019-02-21 14:16:17 +01:00
6ef1c3951a
Ticket Changed
...
Former-commit-id: e258f0932398d9fc58a8d097098c83b7bed084c5
2019-02-21 14:04:00 +01:00
c12ba3b12e
Minor MR and sql updates - presets
...
Former-commit-id: edf310a362b58c68dcadbb078b899948430f23e3
2019-02-21 13:58:29 +01:00
698451ee98
MR25 Discovery
...
Former-commit-id: 2685a72781173e3d87363fe0bc2b5dd72961cdce
2019-02-21 13:38:58 +01:00
a54903d9c6
Merge branch 'ent-3279-planned-downtime-creation-api-cli' into 'develop'
...
API/CLI: fixed planned downtime creation
See merge request artica/pandorafms!2184
Former-commit-id: 84f21e2c9762af3a1c1c04c24dc6e35848c0f437
2019-02-21 13:32:15 +01:00
d9e0f2ea42
Merge remote-tracking branch 'origin/develop' into 3088-Se_carga_filtro_en_vista_de_eventos_cuando_no_hay_filtro_activo
...
Former-commit-id: f0ab3426fdf23bbceed7c2cd991b37c33ec3ae2e
2019-02-21 13:26:12 +01:00
dc4d5b1bd7
fixed error in widget
...
Former-commit-id: 3b0d2e8641d35f7c339aa4229f0a7108216704e0
2019-02-21 13:21:05 +01:00
acf3c94642
fix bad solved conflict and added changes in bd to migrate and mr
...
Former-commit-id: d52e91d0f2b886620aa9fc07dda48bfeb27ffe0c
2019-02-21 13:16:32 +01:00
4148387c50
Updates discovery
...
Former-commit-id: e99072a2b7a1ddd528698e12bdfe75b0b56ba25b
2019-02-21 13:05:48 +01:00
ba87d6a9b8
Merge branch 'ent-3214-exact-oid-matches' into 'develop'
...
Add support for exact matches to SNMP alerts.
See merge request artica/pandorafms!2090
Former-commit-id: 5e4c43a5343f7fa6992c05c93c0695b1881548b9
2019-02-21 11:35:51 +01:00
c385a3191f
minor fixes
...
Former-commit-id: ffb62390a5edaa158507f253cf7fb23c690f8fcf
2019-02-21 11:21:56 +01:00
ad3e2b88bf
Minor fixes Wiz.Discovery
...
Former-commit-id: 750cd3ab1902ed3eda9806aa9b505d5e4a1175be
2019-02-21 11:19:38 +01:00
bb7be444f4
Merge branch '3088-Se_carga_filtro_en_vista_de_eventos_cuando_no_hay_filtro_activo' into 'develop'
...
Fixed error user edit tocken filter events not set.
See merge request artica/pandorafms!2188
Former-commit-id: d293fbdebaf2a1300b4a2082c75d9b92c37cf87b
2019-02-21 09:49:47 +01:00
1156b29743
Auto-updated build strings.
...
Former-commit-id: f760ca3d8b53ad47017d82e6bc2fbb298a69312b
2019-02-21 00:01:55 +01:00
08c6d782a4
Add menuentry discovery
...
Former-commit-id: bc40f0bda89947a88a912484642aa3c89ded64f8
2019-02-20 18:24:32 +01:00
eb3adfb6fb
Data update. added recon scripts app.vmware and cloud
...
Former-commit-id: 1fa41a16848794846fee6b5da510bd49aa7b51b1
2019-02-20 17:17:24 +01:00
0ed6c6d620
Merge branch 'ent-3430-discovery' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3430-discovery
...
Conflicts:
pandora_console/godmode/wizards/Wizard.main.php
Former-commit-id: 570168ca638ea3403de5768b08c640a909aa27d2
2019-02-20 16:54:52 +01:00
f49b26692e
Fixes on wizards
...
Former-commit-id: 98804bde49e19a7ecb3e2749a8955ac656da54a8
2019-02-20 16:47:29 +01:00
8266c716e8
Merge branch 'ent-3138-ent-Cambiar-alert-por-dialog' into 'develop'
...
Cambiar alert por dialog
See merge request artica/pandorafms!2178
Former-commit-id: b8d1f9f1797ef1d3f54975ca8a695f0a5033938e
2019-02-20 16:37:03 +01:00
300626e551
Merge remote-tracking branch 'origin/develop' into ent-3499-Numero_de_respuestas_de_eventos_masivas
...
Former-commit-id: 4a8482ccef3661c83553dff8f5533c29321f95f2
2019-02-20 15:38:15 +01:00
414ff282e2
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
...
Former-commit-id: 2d10f49e4eb2078eebd2f6164866fe2a8412d6a3
2019-02-20 14:38:14 +01:00
4834561e87
Wiz. minor fixes
...
Former-commit-id: b3963bf5994a8f9829922e0a1b0be3a20fc54fba
2019-02-20 14:38:00 +01:00
73a5e691ef
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon
...
Conflicts:
pandora_console/godmode/wizards/Wizard.main.php
Former-commit-id: dead86a654f8b2873721387233a9c9797b0cd8b1
2019-02-20 13:57:54 +01:00
e088b412cd
Added preload schecked values into snmp browser treeview
...
Former-commit-id: d8a3317d849263ff732cbf3a7a7714f4b41917d5
2019-02-20 13:55:21 +01:00
d4cc0f6952
Merge branch 'ent-3497-event-responses-current-user-macro' into 'develop'
...
Added the _current_user_ macro to the event responses
See merge request artica/pandorafms!2179
Former-commit-id: c468e43ec3add15487109c2c961630361bd9bdaf
2019-02-20 13:50:19 +01:00
331b09c520
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
...
Former-commit-id: 7220701d8016a2963cd80cb807bf037af37c2730
2019-02-20 12:32:27 +01:00
f19bdf956e
Wiz. minor fix default value url in goback button
...
Former-commit-id: 434b2acb09290f11c8804024adb8834b86eeda73
2019-02-20 12:32:12 +01:00
af2954d392
Changed controls in static graph vs
...
Former-commit-id: 4db156a5abd372d0d50c252936a00d00416dc475
2019-02-20 11:46:32 +01:00
c527378183
Merge branch 'ent-3345-Error_al_subir_imagenes_en_el_file_manager' into 'develop'
...
fixed error filemanager
See merge request artica/pandorafms!2186
Former-commit-id: d7cbd95f2b8cf86a7cdcbc85e100dc282a94d483
2019-02-20 11:42:29 +01:00
8872968600
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
...
Former-commit-id: c3eed02e448a213a65159897355dc44d844b9741
2019-02-20 11:11:37 +01:00
a63e497497
Wiz. Added textarea input
...
Former-commit-id: 319ab37377e6649c1cd6c6adea1e956e934f2e23
2019-02-20 11:11:26 +01:00
1c7c0ebe8f
Merge branch '3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola' into 'develop'
...
remove special characters from agent alias string on creation and trim blank…
See merge request artica/pandorafms!2100
Former-commit-id: 2e2268eef1c2a45f8c6bc046e9e21d0101d456c0
2019-02-20 11:02:24 +01:00
33ed8a2cc1
Merge branch '3219-Vista-de-custom-fields-diferente-nodo-meta2' into 'develop'
...
Fixed bug in metaconsole custom fields2
See merge request artica/pandorafms!2070
Former-commit-id: cb36006bed0259c9e7c70c420d5e46129d64457a
2019-02-20 11:00:42 +01:00
8ec5cda8bf
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
...
Former-commit-id: 057a5915c8397b3798dcbe97f6ac3f1302879c8c
2019-02-20 10:59:05 +01:00
65db8482c1
Wiz. Added option url to printGoBackButton
...
Former-commit-id: fd0c76ce5efef9902cbda2817b13e59e6672c972
2019-02-20 10:58:56 +01:00
e2bb9e9a15
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
...
Former-commit-id: 4d47587e87964b25e4d5bc2a16551846507c266c
2019-02-20 10:54:09 +01:00
e9d97e8010
Wiz. Added option url to printGoBackButton
...
Former-commit-id: 31c9c56da3475f9b1510904ad7237f993c0a6ccf
2019-02-20 10:53:54 +01:00
55486e7b93
Merge branch 'ent-2836-Operaciones-masivas-filtrado-de-modulos-por-tag' into 'develop'
...
Fixed bug in filtered modules by tag
See merge request artica/pandorafms!2181
Former-commit-id: f313f0cab032ccc8329933a641db8c541b682474
2019-02-20 10:33:28 +01:00
094a5c17d8
Merge branch '3222-Deshabilitar-doble-autenticacion-si-no-esta-activada' into 'develop'
...
disable double authentication option on user edit when disabled in authentication setup
See merge request artica/pandorafms!2054
Former-commit-id: b60f3ec06935ad6b6e456e556c9a281539e42e19
2019-02-20 09:56:49 +01:00
c36241de4f
Add additional help icons.
...
Former-commit-id: 9641eb9ceaefde1c24503fcfb4c7965afedf8fbc
2019-02-20 09:04:15 +01:00
c0e1d0b85d
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
...
Former-commit-id: 420e2b09287bccdacc979be2381159a1ad942a27
2019-02-20 08:59:30 +01:00
ca243c46fb
Minor fix
...
Former-commit-id: f3c550c07a38df24b5de84200190583437586720
2019-02-20 08:52:29 +01:00
3d2ae47543
Added prepareBreadcrum function
...
Former-commit-id: caf781a20bdd16bed7347bf755e2bf0da6ae7e99
2019-02-20 08:41:15 +01:00
53a41a7a56
Auto-updated build strings.
...
Former-commit-id: f44eb5d91d85be5ebfaf5fe25cea0fdb40b874f3
2019-02-20 00:01:26 +01:00
69abba260a
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
...
Former-commit-id: eec0a9614d1dee466d5adb59c9f39d2599360e27
2019-02-19 20:27:34 +01:00
fa3f548cdd
Several changes for Wiz.App support
...
Former-commit-id: 7c86d2e601771686a69d3f1b846638a427a25d6e
2019-02-19 20:27:05 +01:00
55af128cd5
Modified snmp browser to work with wizard
...
Former-commit-id: c8d37e06967ed43867320ae89fd3dc2bede7b0ce
2019-02-19 20:14:14 +01:00
422708c04a
Revert "Wiz.Applications SQL updates" Identification using recon_script
...
This reverts commit e7abe4ad43
2019-02-19 18:33:17 +01:00
819910923f
Added callback to print forms
...
Former-commit-id: 8e95ba3ae518a750d421fcce41238ca7f47b46c2
2019-02-19 18:29:59 +01:00
86d57f2654
Added callback to print forms
...
Former-commit-id: e8f113710158278cb61f494a6c0111e1615ab877
2019-02-19 18:23:20 +01:00
63c00f00a8
Merge branch '3231-Mensaje_erroneo_al_aplicar_grupos_secundarios' into 'develop'
...
Eliminated message when secondary groups are added
See merge request artica/pandorafms!2124
Former-commit-id: 8c96030a463fa3b95ee2eabe3ee13c1852f60ffd
2019-02-19 18:09:38 +01:00
0352ef2b70
Merge branch '3141-SQL-query-a-la-propia-metaconsola' into 'develop'
...
fix metaconsole sql items creation
See merge request artica/pandorafms!2097
Former-commit-id: a2efa5704837d09eec24f144eb0fcc5b922b856a
2019-02-19 18:08:14 +01:00
e7abe4ad43
Wiz.Applications SQL updates
...
Former-commit-id: e0f547a0f35b338705a14df6477bf3a5461d8e49
2019-02-19 17:59:02 +01:00
df88582982
fixed error filemanager
...
Former-commit-id: 4bd54ef9c60396822a1a757bc91218b4d2244efa
2019-02-19 17:52:25 +01:00
218e90a663
Merge branch '2970_No_capta_bien_las_fuentes' into 'develop'
...
Fixed minor bug in pandora flot js
See merge request artica/pandorafms!1897
Former-commit-id: 7c45783033b5f856375498ec30954341a4ddc0fa
2019-02-19 17:51:19 +01:00
07db5ce37d
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
...
Former-commit-id: 9ca0cec89fa7ee8dc9747ab414d95d8afd49877b
2019-02-19 17:15:14 +01:00
ea70c0846c
Added href in wizard
...
Former-commit-id: 9b6b9e66d14257163f14bc904d5b13c6de9f9912
2019-02-19 16:34:11 +01:00
c80a1fc3dd
add tooltip to agent alias on creation
...
Former-commit-id: 8724f37e286080e58d9666fceec2e016fa741138
2019-02-19 16:25:19 +01:00
2c3357ac64
Added interval input to Wizards
...
Former-commit-id: ad64615eed06f025654d7875a3b572b865364d37
2019-02-19 16:06:41 +01:00
8a8fe51fd4
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
...
Former-commit-id: 63d4570061d0b0ce371c6b41cc4bfec61f6564c2
2019-02-19 15:51:14 +01:00
eb49bde71f
Ticekt resolved
...
Former-commit-id: b93b1c5cb39239f3b038d55b39e8102de1628742
2019-02-19 15:50:14 +01:00
04c4162419
Merge branch '339-No_cortar_elementos_en_PDF' into 'develop'
...
339 no cortar elementos en pdf
See merge request artica/pandorafms!2163
Former-commit-id: 756360a1b91e5edf2c1af80e601085f7b41b505c
2019-02-19 15:39:03 +01:00
cf79f54a48
fixed minor error
...
Former-commit-id: ffde6120127e31865553a8b06f91b3f0938a164c
2019-02-19 15:07:07 +01:00
d4e7cbcdc8
Fixed error user edit tocken filter events not set.
...
Former-commit-id: 6c57c05f82fc0be260428474408384527d66a838
2019-02-19 14:55:44 +01:00
2573e40538
Bugfix
...
Former-commit-id: 0ea7cf8437935c77098b1e408a723ac3de4d973c
2019-02-19 14:52:14 +01:00
68afc9289d
Documentation improvements
...
Former-commit-id: ad2155056dd26014f169e277eec2ac7cd463ea3a
2019-02-19 14:51:40 +01:00
1b82a970b1
WIP: App wiz
...
Former-commit-id: aa969dc2fead693977959374c747f046676c5fed
2019-02-19 14:36:16 +01:00
2e78012e40
Fix double authentication check in meta authentication setup
...
Former-commit-id: 37fea3368898f58fafda9c485b93bf07c8ad81fa
2019-02-19 13:13:13 +01:00
00cba4cbc9
Fixed bug in filtered modules by tag
...
Former-commit-id: 098d3c88a9a30fb1c38074e741f093ff40fd5d02
2019-02-19 13:05:31 +01:00
7bd5851667
Add support for column macros.
...
Former-commit-id: 8b826854c288754feefdbe270701655c6bbbfac9
2019-02-19 13:04:57 +01:00
d116e4742a
add new tocken max events responses
...
Former-commit-id: f65e6a478812a913d25fa7b87e9ac2b26b9a5ff4
2019-02-19 12:14:42 +01:00
d554dcc7db
Added the _current_user_ macro to the event responses
...
Former-commit-id: 1a5860bc7a62efecba44d467df9eb9cf7e25070b
2019-02-19 11:37:44 +01:00
8c09b945c7
minor fix changed customer check
...
Former-commit-id: f2659c9e7780dcddaa9528b1aa13a4d61026c154
2019-02-19 11:14:48 +01:00
85371424ee
Minor fixes and status check
...
Former-commit-id: 47a7e75579927c0ac109f303b77ebcc273334581
2019-02-19 11:13:07 +01:00
c9cc744e07
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon
...
Former-commit-id: d609bc3171cb75d89b641f6dd100e593ae5d1ebd
2019-02-19 11:01:11 +01:00
b8fe20e373
Merge branch '3193-Mal-unidades-de-tamaño-de-log-en-diagnostic-info' into 'develop'
...
Fixed bug in diagnostic info
See merge request artica/pandorafms!2076
Former-commit-id: 79147da886f68dc106ba946a06bad66a6fd00d59
2019-02-19 10:28:31 +01:00
8ac1642dea
Merge branch 'ent-3431-discovery-host-devices' of brutus.artica.lan:artica/pandorafms into ent-3431-discovery-host-devices
...
Former-commit-id: 7b45b6f2d34e1592b9898dc94c826d138e2b6e63
2019-02-19 08:59:41 +01:00
938408ada9
Added wizard
...
Former-commit-id: d47389f000b9295c21d9a56ed0138913d0045b76
2019-02-19 08:58:30 +01:00
2b3a72e938
Auto-updated build strings.
...
Former-commit-id: cf3f4af9caa5c9c435adf672e8c620b4b173f3cc
2019-02-19 00:01:28 +01:00
7f0b676e0f
Discovery tasks. Extended events. Autoconfigure detected agents.
...
Former-commit-id: da2282082606c970dbace453193eb0a7e4089731
2019-02-18 19:50:13 +01:00
af110f4820
minor fix notification direct assignment
...
Former-commit-id: 59ffb2338377ac2c3270681e6905f5d853add16b
2019-02-18 18:13:22 +01:00
9f6a96675e
Merge branch 'develop' into ent-3138-ent-Cambiar-alert-por-dialog
...
Former-commit-id: 5928dfed7bff1870450b7fe9f652d92973b21591
2019-02-18 17:34:24 +01:00
4473762393
Merge branch '3227-No-se-guarda-muestra-correctamente-certificado-ssl-en-setup-general' into 'develop'
...
fix bug when updating path of ssl certificate in general setup
See merge request artica/pandorafms!2052
Former-commit-id: 453119a3a14e50ce6834eb1ee46da2f1289d6082
2019-02-18 17:18:46 +01:00
bb83f4ba4a
avoid to show notification if disabled by user
...
Former-commit-id: d00b09c9e608c51223f7192ad85408976fac5baa
2019-02-18 17:08:23 +01:00
5411b83ceb
Merge remote-tracking branch 'origin/develop' into 3404-Mejoras_y_arreglos_en_la_instalación_de_la_consola
...
Conflicts:
pandora_console/install.php
Former-commit-id: 9d1616cab554029cb90f7c0e89276124589e2867
2019-02-18 16:55:09 +01:00
3856059c98
Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF
...
Former-commit-id: 9831b389fd955e7351f9f9e07530ff060dad0e49
2019-02-18 16:38:15 +01:00
43ddd9d482
fixed pdf
...
Former-commit-id: e220052501d8f1b4c3d8f392cc9665876671e7ae
2019-02-18 16:34:48 +01:00
25f389b325
Merge branch 'develop' into 3193-Mal-unidades-de-tamaño-de-log-en-diagnostic-info
...
Conflicts:
pandora_console/extras/pandora_diag.php
Former-commit-id: d49e9ec693a709661bc69f2b3f4282ccb9a67123
2019-02-18 16:25:30 +01:00
37f6da9aa8
recovered. changes from 0b72571c7c [formerly f3a8cdd6923834443ed7223d1e6ad7776b861184]
...
Former-commit-id: 591e002043d2bae2382c8a91c437057fd2b809c7
2019-02-18 15:36:51 +01:00
27602d8e49
Recovered notification editor for user
...
Former-commit-id: a4fbf05912c974ab388cde9e9237022f2bcc3277
2019-02-18 15:14:24 +01:00
cb94692491
Added function addBreadcrum in Wizard main
...
Former-commit-id: ac40c2fd49ff02a84dc6752c4ea99309a3d4440f
2019-02-18 14:30:03 +01:00
7b2e0342c1
Fix. notification did not reach ALL target
...
Former-commit-id: 237e5dac34bcbe50453e0b56f0964a9d74aa7c04
2019-02-18 14:18:58 +01:00
34cf0bd837
minor fix acl check in notifications
...
Former-commit-id: 3ee0004f0c8ab507ed2301b77117ca945fb4e826
2019-02-18 14:01:17 +01:00
46af41a2cc
support for autoconfiguration
...
Former-commit-id: 034ed513ed9cf7efbe22720b61e8ff431ebbbc84
2019-02-18 14:00:55 +01:00
5816320eff
new token. autoconfiguration_enabled. discovery tasks
...
Former-commit-id: d19c86696b73335b6977d11d5ea683131780097e
2019-02-18 14:00:38 +01:00
e5eb91e62a
Merge branch '3154-Agent-name-en-vistas-de-alertas-de-consola-movil' into 'develop'
...
agent named replaced by agent alias in mobile console's alerts view
See merge request artica/pandorafms!2066
Former-commit-id: 527b887ac9e21faafc27e111a189e3e40056b3a3
2019-02-18 13:42:03 +01:00
e00ae31862
Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF
...
Conflicts:
pandora_console/install.php
Former-commit-id: e10a178c783187df7d07027f11b4fa1c06f923b0
2019-02-18 13:16:43 +01:00
efd65edefa
fixed errors
...
Former-commit-id: dc70e23da17691f3af6602cd85e2f01b27d27d58
2019-02-18 13:13:17 +01:00
59cd0a43ea
Merge branch '2536-Error-login-hash-al-editar-una-custom-graph-desde-la-meta' into 'develop'
...
ent-2536-Error-login-hash-al-editar-una-custom-graph-desde-la-meta
See merge request artica/pandorafms!2111
Former-commit-id: b9770bc97e741d6e6d7b0ab111c195ac3fe440df
2019-02-18 12:16:55 +01:00
01b8649812
Merge branch '1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica' into 'develop'
...
Added option in setup for unique main IP in agents - #1744
Closes pandora_enterprise#1744
See merge request artica/pandorafms!2114
Former-commit-id: 77e1bbae9a1a60bc51739d98948ca8af5d183f78
2019-02-18 12:16:20 +01:00
a1a429aa52
H&D minor fixes and acl checks
...
Former-commit-id: cec9ec899e648ab6e76716333c8ee09ca875023a
2019-02-18 12:14:03 +01:00
29206eb3bb
Added visual changes
...
Former-commit-id: 33ac4873763e6b0e2cf3d2ad2b25492fe5b33583
2019-02-18 11:42:55 +01:00
a6bbd17423
Merge branch 'ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon
...
Former-commit-id: 11a9f65a87b0b479791aa76e4936cebfb5ab7424
2019-02-18 10:24:35 +01:00
a9caebbbf4
Put the list into a function
...
Former-commit-id: 11e4d0faa3512e46582530f48bab2cfa1031e89f
2019-02-18 10:24:19 +01:00
4017539728
Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica
...
Conflicts:
pandora_console/install.php
Former-commit-id: 25f781cc2a2be2258e2ad601353afd9f80561a7c
2019-02-18 09:27:40 +01:00
582b8a70da
Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows
...
Conflicts:
pandora_console/install.php
Former-commit-id: 0c97025f2425b1048efd1447a56ea9e2062b3b13
2019-02-18 09:22:48 +01:00
2332001884
Merge branch 'ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon
...
Conflicts:
pandora_console/godmode/servers/discovery.php
Former-commit-id: 4e840a1738523e2e0570413e8e7dedb02b265919
2019-02-18 08:50:54 +01:00
0ef118f401
Auto-updated build strings.
...
Former-commit-id: 2e217d82f2119ffdca6218a233fa8eeb743c3fb0
2019-02-18 00:01:24 +01:00
1fafda8502
Auto-updated build strings.
...
Former-commit-id: affb7e6fc134d1ae80be0450f759a30960b177fd
2019-02-17 00:01:24 +01:00
0d93ccc094
Auto-updated build strings.
...
Former-commit-id: 8789c127ad23a066317bd86d0bfe456dd4a3ec38
2019-02-16 00:01:31 +01:00
c49c8bc0b5
discovery minor style changes
...
Former-commit-id: ea572c9d797214cbfc6f1b9ff2025f0c4819b4ed
2019-02-15 18:44:59 +01:00
912f0baace
Discovery Tasks first tasks and some minor fixes
...
Former-commit-id: 4a37dc99f1b1a95217e9be207526d750133a14a6
2019-02-15 18:42:44 +01:00
a5ad61f340
discovery delete task
...
Former-commit-id: 8809067053aa6bebfa61498afb2108aea352f3d7
2019-02-15 18:35:35 +01:00
5093094d7d
H&D tasklist and some visual changes
...
Former-commit-id: d9130ec520b0c23a9cf42ce62aae6c3d2432649b
2019-02-15 18:05:59 +01:00
0f375d6a76
H&D minor fix group cannot be All
...
Former-commit-id: 2feb42ce06bd379bbb3804a30fab744a4b01b1e1
2019-02-15 16:37:48 +01:00
45fd528e38
minor fixes H&D
...
Former-commit-id: c3236b91b4b6a0f37af2d4da4955c711dd4ace43
2019-02-15 16:02:55 +01:00
46de260573
Merge branch 'develop' into 2536-Error-login-hash-al-editar-una-custom-graph-desde-la-meta
...
Former-commit-id: 36cdf03e3debabc0a079f08a457c8d2c0ac1c165
2019-02-15 15:55:31 +01:00
337b846f48
Merge branch 'develop' into 3141-SQL-query-a-la-propia-metaconsola
...
Former-commit-id: 16a42b43088f8f99b9c33fe05a53f220598b2135
2019-02-15 15:35:57 +01:00
41c4ad8d90
Merge branch 'develop' into 3154-Agent-name-en-vistas-de-alertas-de-consola-movil
...
Former-commit-id: aa3d44b06df07f90092f6bab50b2c6ef63660fc5
2019-02-15 15:30:36 +01:00
0c99fe279f
Merge branch 'develop' into 3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola
...
Former-commit-id: 2b9c06e16291022e626c42503c45776193a0c5ce
2019-02-15 15:13:45 +01:00
c16fb1696d
Merge branch 'develop' into 3222-Deshabilitar-doble-autenticacion-si-no-esta-activada
...
Former-commit-id: 6024bd09f1bb77c7610a8adbb72a92631ad6e59d
2019-02-15 15:03:42 +01:00
2c97708373
Merge branch 'develop' into 3227-No-se-guarda-muestra-correctamente-certificado-ssl-en-setup-general
...
Former-commit-id: d6becbfc3aba9d5197b748647db5e93e3b58c348
2019-02-15 14:56:20 +01:00
087978aa70
fixed errors in reports
...
Former-commit-id: de2cb22c4545dd5ae859f7059e5c8ba13a195723
2019-02-15 14:36:58 +01:00
e4ca9b7fc8
Merge branch 'develop' into 3281-Vista-monitor-detail-personalizar-campos-a-mostrar
...
Former-commit-id: 1683307f273ba5676ec61709403249b24113c47f
2019-02-15 14:22:55 +01:00
c62c01c4a0
H&D minor fix - visual
...
Former-commit-id: 57d1e3c62192d9568bfa4db11658e31a8d811a3a
2019-02-15 14:14:56 +01:00
e04a61df98
Merge branch 'ent-3431-discovery-host-devices' of brutus.artica.lan:artica/pandorafms into ent-3431-discovery-host-devices
...
Former-commit-id: 1744720e44aea863fb01c328cb2d25382d2c40a8
2019-02-15 14:03:29 +01:00
e397353f71
minor fix get_parameter_switch
...
Former-commit-id: c8e430e1cbd789a99058217e7dffb4098aab821a
2019-02-15 14:03:16 +01:00
32d34cd09b
Changed styles in host and devices
...
Former-commit-id: 743f203466e8e3745a33837054e5bc4faa69337c
2019-02-15 14:02:32 +01:00
ec672d6bfb
H&D network scan
...
Former-commit-id: dcd22994d6addf69ab5d68a6724d12e26e994d15
2019-02-15 13:57:33 +01:00
196de9ae3d
Merge branch 'develop' into 3373-Añadir-opcion-a-mas-parametros-en-api_get_groups
...
Former-commit-id: b8436e3dcbc1b23de21653fcbaff88c544c79562
2019-02-15 13:54:28 +01:00
6c485795c7
Merge branch 'ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon
...
Former-commit-id: adb71ba49b8d3e6081aaa8c91af8c42e7c18c689
2019-02-15 13:48:08 +01:00
c9c855da9a
Added new Cloud Wizard class
...
Former-commit-id: 789af2b6cba344bac44b34c4c90228801f2468a0
2019-02-15 13:47:11 +01:00
6c9ce7e65b
Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica
...
Conflicts:
pandora_console/godmode/setup/setup_general.php
pandora_console/include/styles/pandora.css
pandora_console/install.php
Former-commit-id: b94f977a4d39f2e9e59b7ed9626115b0a458c5dd
2019-02-15 13:18:10 +01:00
efdc17b801
WIP: H&D
...
Former-commit-id: 605aa350c6d8d9bcebadbb941bba2a6fc399cb7c
2019-02-15 13:08:44 +01:00
a20d7b9ce1
Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows
...
Conflicts:
pandora_console/install.php
Former-commit-id: ef2b7fb631fab61bcb5e21b0632f02a3af451045
2019-02-15 12:10:49 +01:00
f777c59a83
WIP: H&D skel files css wiz&discov
...
Former-commit-id: e57758a9e77b19868262557d9e11a0ff7b38f02c
2019-02-15 10:00:23 +01:00
ffe8bba3f7
added exception in ldapsearch
...
Former-commit-id: 4ab1637c30cac2bb4c827b1e08017f6b08fae1b9
2019-02-15 09:10:21 +01:00
cd83f324a1
Auto-updated build strings.
...
Former-commit-id: 3efb9b48fb3cc1021d0b3e7752c3cd1607e863a5
2019-02-15 00:01:26 +01:00
96fccc578c
WIP: H&D
...
Former-commit-id: 82a6c84a2c896a08f420a89dc3fe6cd79d8ff3bb
2019-02-14 17:56:10 +01:00
2059614ba2
missed install...
...
Former-commit-id: a2e1bc42354612afde7e1a28845348f41eab7509
2019-02-14 17:20:00 +01:00
3995874176
WIP: H&D: merge
...
Former-commit-id: c1e04b80a49fb0a9870676dc8f59732cd595fbc0
2019-02-14 17:19:20 +01:00
7df9d4f78b
WIP: H&D merge
...
Former-commit-id: d53f7d5abed5cfc8d45e6a42bfd52089ff463ff3
2019-02-14 17:14:01 +01:00
52c4b3dab1
Merge branch 'ent-2806-Administracion_base_de_datos_de_historico' into 'develop'
...
add params setup historic database
See merge request artica/pandorafms!2154
Former-commit-id: ef832c053b6e678ec48c95a5494aa2b774b533ed
2019-02-14 17:00:56 +01:00
0d7ea0d056
Added CSV report and copy a lot of not revisted code
...
Former-commit-id: 005362b157450862501963770df3fd0419bc573a
2019-02-14 16:56:03 +01:00
624d804168
Fixed minor error
...
Former-commit-id: 05fc8b97c42ee9907954cb28d9e560c9076d50e9
2019-02-14 16:53:01 +01:00
f849c2b0f0
Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows
...
Conflicts:
pandora_console/include/styles/pandora.css
pandora_console/install.php
Former-commit-id: d74f5cb5c6ff0cc05542e63d1f8537f289eebfc8
2019-02-14 16:41:17 +01:00
d9ba3af358
Fixed errors in setup performances
...
Former-commit-id: 1eb48c00f527f43504a41aea8b352f30792e080b
2019-02-14 16:31:19 +01:00
4c94956b91
Merge branch 'ent-3459-7439-vista-de-edit-item-report-template-muy-lenta-debido-a-query-no-optimizada' into 'develop'
...
Fixed slow query in template item
See merge request artica/pandorafms!2151
Former-commit-id: db1f74b219dcac4180690d56310dcc2a11acd14d
2019-02-14 16:15:01 +01:00
40143a1402
fixed reports
...
Former-commit-id: 99e8d84b1db440156f8b382ded51be7c39322eed
2019-02-14 15:50:13 +01:00
04e8962cec
Merge branch 'ent-2967-6662-Error-504-en-vista-de-eventos' into 'develop'
...
Ent 2967 6662 error 504 en vista de eventos
See merge request artica/pandorafms!2167
Former-commit-id: 4096c814248a75bbe5e75858b31ee040379d6486
2019-02-14 14:55:33 +01:00
8acb658266
WIP: H&D
...
Former-commit-id: 7e74f1330b7e5cfdab3757ec62523942a1b4fe9f
2019-02-14 13:27:49 +01:00
070db506b8
WIP: H&D
...
Former-commit-id: 8f66bccf64b219df20d19d72eb41bec8acdd9bbc
2019-02-14 11:53:06 +01:00
685d8c04c2
WIP H&D base structure
...
Former-commit-id: dace1164c5a568adbb98c187106838d25334f934
2019-02-14 11:32:07 +01:00
3e9e668e00
Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3431-discovery-host-devices
...
Former-commit-id: e20038920481419abfaeddc665b3369f90b49fef
2019-02-14 10:59:27 +01:00
6ff357595d
Merge remote-tracking branch 'refs/remotes/origin/ent-3431-discovery-host-devices' into ent-3431-discovery-host-devices
...
Former-commit-id: 8210f6bb9abb2c666b6cf4e914d87bb92e8b0690
2019-02-14 10:58:26 +01:00
0db88817a9
WIP H&D
...
Former-commit-id: c3b0b6f56ff0591f8c5839d61144bbb72ddd7033
2019-02-14 10:56:25 +01:00
6e7369d672
Merge branch 'ent-3381-eventos-extendidos' into 'ent-3430-discovery'
...
Ent 3381 eventos extendidos
See merge request artica/pandorafms!2169
Former-commit-id: b8a4fd52a30b8cc34c2417499ce3b4a60c027edf
2019-02-14 10:51:04 +01:00
57991495e4
Use the CSV extension to import CSV on host and devices
...
Former-commit-id: ed95b09992ee681e35e7f934b8a8ac70c83bc8be
2019-02-14 10:30:01 +01:00
52bf8befd2
Merge remote-tracking branch 'origin/develop' into 3404-Mejoras_y_arreglos_en_la_instalación_de_la_consola
...
Conflicts:
pandora_console/install.php
Former-commit-id: 02eb23f0147608c8154aad2c312d8f9d84390806
2019-02-14 08:06:19 +01:00
0fb61444f6
Merge remote-tracking branch 'origin/develop' into ent-2806-Administracion_base_de_datos_de_historico
...
Conflicts:
pandora_console/godmode/setup/performance.php
pandora_console/include/functions_api.php
pandora_console/install.php
Former-commit-id: e8fc07d1f10723700114949b30e9f3770208149e
2019-02-14 08:01:23 +01:00
444b5c4bfd
Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF
...
Conflicts:
pandora_console/install.php
Former-commit-id: f26bcce527ebe225454700e8feca21610f91b20f
2019-02-14 07:51:53 +01:00
f91635c67c
fixed errors in pdf reports
...
Former-commit-id: fbc3598ab2dfd11cc2bfa850ba49b3e35481218d
2019-02-14 07:46:19 +01:00
f0338cd08e
Auto-updated build strings.
...
Former-commit-id: d0d40baca6720eb12b085a1968d827b8e9e767b0
2019-02-14 00:01:26 +01:00
c0dd81cab5
Merge branch 'ent-3277-Error_al_guardar_password_en_chequeos_wmi' into 'develop'
...
Fixed WMI passwords when encrypted
See merge request artica/pandorafms!2164
Former-commit-id: 7c2aeffb2849a3539569b2706b4ca613e1c632a8
2019-02-13 18:33:11 +01:00
5b4cadf138
minor style fix
...
Former-commit-id: ca2dcf89672832b7796c9b9cc555d36d9db503ec
2019-02-13 17:16:12 +01:00
812382a47f
Update manage_network_components_form.php
...
Former-commit-id: 17e3faf98a33bb6f7e21e805085f366944e51ea4
2019-02-13 16:51:22 +01:00
f75a292b34
minor fixes/updates in notifications UI
...
Former-commit-id: d4f5b7db1b5a6f0a023e33c4b8cd55db7765b11a
2019-02-13 16:40:37 +01:00
8abb1b90dc
Merge branch 'ent-3259-Errata-en-boton-de-ayuda-en-Modulos-WMI' into 'develop'
...
Changed popup windows by tooltips
See merge request artica/pandorafms!2106
Former-commit-id: 5682d4f7088be60279aaf33a9756b306a23ea4d8
2019-02-13 16:08:01 +01:00
f7134b6d81
Merge branch 'ent-3377-Bug_Manager_Update_Online_de_la_version_OpenSource' into 'develop'
...
Ent 3377 bug manager update online de la version open source
See merge request artica/pandorafms!2171
Former-commit-id: f353173953ab39af5bd6e1f39d41e37c7476618a
2019-02-13 15:56:19 +01:00
7f4353c4bc
optimized. events_has_extended_info
...
Former-commit-id: 2435badcea24fd5777bde358658409bf947a2d4b
2019-02-13 15:55:03 +01:00
453c639c53
optimized. events_has_extended_info
...
Former-commit-id: 805b80f1a9e09425b0e5710906886ae39e791753
2019-02-13 15:54:40 +01:00
4c809ba8d2
event query optimization
...
Former-commit-id: 322868d281ddeac4006480bac6dbf03434ffefa1
2019-02-13 15:41:34 +01:00
10a37c313c
DB schema update native WMI scan
...
Former-commit-id: 995fce571f2f37c5cbe891f726fa979cbb8ef183
2019-02-13 15:05:21 +01:00
9951aadab3
Fixed typo
...
Former-commit-id: 469f46c34caefcb6b810e99f88a9223434959182
2019-02-13 15:04:53 +01:00
74e16b656b
Disable max postpone select
...
Former-commit-id: 43460b3304b70d6d0248ace672d51c2b48c3d22c
2019-02-13 15:03:59 +01:00
ed63ef47fa
Moved ReconServer to DiscoveryServer
...
Former-commit-id: 5e18aa75d669f6b45d3b4e2648f31473fd206091
2019-02-13 14:56:10 +01:00
40419ea587
Merge branch 'develop' into ent-3259-Errata-en-boton-de-ayuda-en-Modulos-WMI
...
Conflicts:
pandora_console/godmode/agentes/module_manager_editor_wmi.php
Former-commit-id: ec88c5b6ff36318db9a1f9ca98651bb49aa6eb9d
2019-02-13 14:55:21 +01:00
0ecf2bb9c4
Added pandora db messages purgue
...
Former-commit-id: 23d1f55ac6b7d6d5470fa25860b9bbb1575875df
2019-02-13 14:43:55 +01:00
bf0fc07533
Merge branch 'develop' into 3219-Vista-de-custom-fields-diferente-nodo-meta2
...
Conflicts:
pandora_console/include/functions_events.php
Former-commit-id: 00b8cb47f7294fa6cd3c3fe257e18a1e56759580
2019-02-13 14:38:56 +01:00
855822f61e
Fixed arrow on notifications area
...
Former-commit-id: 6771d282bf7a6b5b9ddd0baec8a0a887f741d931
2019-02-13 12:44:30 +01:00
6a9e69adb1
Added changes
...
Former-commit-id: 0d0de6dba065aaaa5bbfc4b9f9790e4ef1b92b7d
2019-02-13 12:21:31 +01:00
artica
fbsanchez
daniel
Daniel Maya
Daniel Rodriguez
manuel
Tatiana Llorente
Luis Calvo
Alejandro Fraguas
Alejandro Gallardo Escobar
samucarc
alejandro-campos
artica
fermin831
marcos.alconada
Ramon Novoa
Samuel Carcases