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

20513 Commits

Author SHA1 Message Date
fbsanchez db9068e25a fixes in non agent per database 
Former-commit-id: 180cf7269886787b17dc359bf941b5ce5e1b1313
 2019-04-05 10:41:09 +02:00
Daniel Barbero 447655409d fixed minor error keep counters local and network components 
Former-commit-id: 8d57bede6ea7c6f44d51a696a3257600410734fe
 2019-04-05 09:27:46 +02:00
Manuel Montes 6bd38c6d4c Merge branch 'develop' into 'ent-3740-Buguillo-en-configuracion-de-ACLs' 
Conflicts:
   pandora_console/include/functions_menu.php

Former-commit-id: 96e46da859b6d05409a8b2166bb2822493fe6558
 2019-04-05 08:15:48 +02:00
artica 8d0e53924d Auto-updated build strings. 
Former-commit-id: 015143b34e644f24b26d36fba4b78525d39ff2e0
 2019-04-05 00:01:32 +02:00
fbsanchez e76a5af441 minor fix parent link 
Former-commit-id: a2330dd0159ad58c454a06b7efe16699f7cee84a
 2019-04-04 18:20:26 +02:00
Luis Calvo 33db6d2f0c If is metaconsole, param meta is setted to true 
Former-commit-id: d652754fc131a0024c0c7846335a4362767e5f1d
 2019-04-04 18:13:29 +02:00
Daniel Rodriguez c52b30fd7e Merge branch 'ent-3784-error-creating-alert-actions-api' into 'develop' 
Insert zero into fires_min an fires_max when null

See merge request artica/pandorafms!2318

Former-commit-id: b7d8c6738530e1d842be34ad7f81c31a898d1c76
 2019-04-04 18:03:53 +02:00
fermin831 14ea1a4714 Fixed inverses intervals on server 
Former-commit-id: 20f9e139bb3f40700e3081e4ce9ec134b70786a6
 2019-04-04 17:47:40 +02:00
fbsanchez 5e91e3fa50 Merge branch 'ent-3792-northern-instalar-paquetes-consola-en-red-hat' into 'develop' 
rhel dependencies

See merge request artica/pandorafms!2339

Former-commit-id: b75a756a70434f1a25f4a4f0a129681b3f01f19f
 2019-04-04 17:42:56 +02:00
fbsanchez fdb13c1d1f rhel dependencies 
Former-commit-id: dd8eccf5d3476dc01ec2d409558483c90f20f499
 2019-04-04 17:35:27 +02:00
manuel 49c913c6de Added custom fields to report templates 
Former-commit-id: 525d21d17835a3bb08f47df273128e658a35bcd9
 2019-04-04 17:31:11 +02:00
fbsanchez 79074a274e Merge branch 'ent-3792-northern-instalar-paquetes-consola-en-red-hat' into 'develop' 
forced dependencies 7.2 spec pandora_console rhel

See merge request artica/pandorafms!2338

Former-commit-id: 8f7adb7f4a8ad922a7d27eb44f2a449235b6c405
 2019-04-04 17:26:10 +02:00
fbsanchez 21294807f4 forced dependencies 7.2 spec pandora_console rhel 
Former-commit-id: 6cc644ccbf3afd341d9aafe0bd3cbd6ca3210f0f
 2019-04-04 17:12:08 +02:00
fbsanchez 143c501a6e minor fixes 
Former-commit-id: 8d8c891a963b0e03838c2bf184b5da6bed01b2a9
 2019-04-04 17:08:31 +02:00
fbsanchez 1274380270 minor fix 
Former-commit-id: a012c8155cd1d950044bc2c0531ee2abd9e89d07
 2019-04-04 16:07:50 +02:00
fbsanchez 56f2acbbf1 discovery.app.mysql rc1 
Former-commit-id: 51304e872d375b480cbbf88d058b1804106afb98
 2019-04-04 16:05:16 +02:00
fbsanchez ce9f9eab4e rc1 mysql recon 
Former-commit-id: 51e000229d6c2c94e59e8eeb8ef77d539ee6c775
 2019-04-04 16:00:08 +02:00
fermin831 43b296c49c Added docs to cron functions 
Former-commit-id: 7f20d7abe989adcfc841e0ce20afbe007b660038
 2019-04-04 15:30:30 +02:00
fermin831 c5a49916cb Fixed cron day of the week 
Former-commit-id: eb6b7974d7304c430068375f19ef60db1a2bb442
 2019-04-04 15:04:23 +02:00
fbsanchez f9fd0062e9 Merge branch 'ent-3792-northern-instalar-paquetes-consola-en-red-hat' into 'develop' 
added +x permissions to build_rpm_rhel7

See merge request artica/pandorafms!2335

Former-commit-id: 2c7239c6e533866710eacf7b763586c06d0d07ea
 2019-04-04 12:38:52 +02:00
fbsanchez a1a4ae51e2 added +x permissions to build_rpm_rhel7 
Former-commit-id: 4d1c78a1443ecaa138b861092f0c98ad1496b193
 2019-04-04 12:30:50 +02:00
fbsanchez fcafe76943 wip discovery f34 
Former-commit-id: bb08450d3304ff140c4bae37e77b20a2329c600b
 2019-04-04 12:28:17 +02:00
Alejandro Fraguas ac0ad88e8d Merge branch 'ent-3829-7866-no-se-ve-cabecera-si-tenemos-habilitado-token-"Fixed-header"' into 'develop' 
Fixed problem with fixed header

See merge request artica/pandorafms!2331

Former-commit-id: 1cdcf881352c404b25cfcbc8c6b63a2c67dd05e5
 2019-04-04 10:19:04 +02:00
artica f64835dca9 Auto-updated build strings. 
Former-commit-id: fd545daafd448831b9e29eff8629dc3b7c6a630b
 2019-04-04 00:01:27 +02:00
fbsanchez 9e83f139e1 WIP discovery f3 
Former-commit-id: cee7ee096e0a0c065bc4312a149ee223303224fc
 2019-04-03 22:52:37 +02:00
fbsanchez 654e0c28f6 WIP discovery F3 app db my multiserver 
Former-commit-id: a85c048a6d4e755b76a7e042e04cfebdfe69b6f4
 2019-04-03 22:44:06 +02:00
fbsanchez 74303168ac WIP discovery F3 
Former-commit-id: 493d05714a31c2f91f7b8ea5445397ebf1c526d7
 2019-04-03 21:55:11 +02:00
fbsanchez 60f37eac57 removed unused folders 
Former-commit-id: 4c1870e836e7f05dd5a312e41c4f1f86bff26e22
 2019-04-03 21:08:52 +02:00
Daniel Rodriguez 1c4765f4f5 Merge branch 'ent-3688-7704-no-cambia-el-propietario-del-evento-en-event-response' into 'develop' 
Resolved

See merge request artica/pandorafms!2251

Former-commit-id: dc092a97b35022dd846775568df9fca1e332022a
 2019-04-03 18:47:52 +02:00
fbsanchez 798a2aad16 WIP discovery F3 
Former-commit-id: 19570468cf4de9f600ab9a01468d1e59c69e6939
 2019-04-03 18:13:19 +02:00
Daniel Rodriguez 25960e65ba Merge branch 'ent-3320-7151-parametros-instalacion-destendida-windows' into 'develop' 
Added alias to windows configuration file

See merge request artica/pandorafms!2329

Former-commit-id: 04f3fb87c82d248a6caa197464893aab2973531c
 2019-04-03 17:07:45 +02:00
Daniel Maya 8923c53ec4 Fixed problem with fixed header 
Former-commit-id: 9bf6d824b94f301a804511c106f6465ce9dff0fa
 2019-04-03 16:48:28 +02:00
Alejandro Fraguas 54f6f595dd Merge branch 'ent-3824-7869-Mapas-GIS-no-funcionan' into 'develop' 
Fixed problem with openlayer

See merge request artica/pandorafms!2330

Former-commit-id: 639deee6b66cf43894f4eb093d590d699bb9d37c
 2019-04-03 16:02:45 +02:00
Daniel Rodriguez 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
Daniel Rodriguez 8f369828c4 Merge branch 'ent-3792-northern-instalar-paquetes-consola-en-red-hat' into 'develop' 
RHEL specs and build orders (update version)

See merge request artica/pandorafms!2327

Former-commit-id: 8d6acaab90efec5cec698272e98f76ebc40b39df
 2019-04-03 13:11:25 +02:00
Daniel Maya faecabb1cc Fixed problem with openlayer 
Former-commit-id: 91eb396d550cd6a90c9c3ba4cbb0ec12c2c51c6e
 2019-04-03 12:54:36 +02:00
Alejandro Fraguas dcd5ab6317 Merge branch '3787-agents_get_agents' into 'develop' 
rollback agent_get_agents

See merge request artica/pandorafms!2309

Former-commit-id: 7badea15471fa3d7aae787f913c76c8da70472cc
 2019-04-03 12:04:52 +02:00
fermin831 e642907215 Merge remote-tracking branch 'origin/develop' into ent-3791-7780-cron-en-modulos-no-funcionan-bien 
Former-commit-id: 46844dc1e44569be828ae90bfb22c669d4eb352a
 2019-04-03 12:00:48 +02:00
Alejandro Fraguas ee59f4678e Merge branch 'ent-3801-no-funciona-event-storm-protection' into 'develop' 
Add a missing configuration option.

See merge request artica/pandorafms!2322

Former-commit-id: 6ccc3926eb2d4fe76e2a60f6f74a242ce7e84051
 2019-04-03 10:57:26 +02:00
fermin831 1dcdc1bc79 Added alias to windows configuration file 
Former-commit-id: 52b7462f8b8192a1d9de636a3b13eb7ee3fb9871
 2019-04-03 09:53:17 +02:00
artica 30e9b67062 Auto-updated build strings. 
Former-commit-id: 64d58c7568e01fecd9c4c97a49eeb9df7d55c5dc
 2019-04-03 00:01:33 +02:00
fbsanchez 11d8edd88b RHEL specs and build orders (update version) 
Former-commit-id: 582d1bea42bc41a23fc773cf1d411bb4bdad50aa
 2019-04-02 18:04:33 +02:00
Daniel Barbero Martin a0a250bef7 fixed error add ff_type 
Former-commit-id: b270ec363b84bbfafcea5418b6007aba8217680b
 2019-04-02 16:45:01 +02:00
fbsanchez 11b2fbc245 WIP db 
Former-commit-id: 3c231b9d90dc6c9fae5e7e398e829c8c28ffeed9
 2019-04-02 16:25:29 +02:00
manuel 1fd40447e1 Custom fields in availability report type 
Former-commit-id: 1f04e5728cf7d0ed5079c16488493188379d536c
 2019-04-02 16:24:29 +02:00
Daniel Barbero Martin c679751f94 fixed error add ff_type 
Former-commit-id: 177e40f655f309eed3e7d877ffb00172b0105095
 2019-04-02 16:01:24 +02:00
Daniel Barbero Martin 7be3d5fa58 Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop 
Former-commit-id: d0667e3686d186a79fe7525f73a770257eaaf883
 2019-04-02 15:39:32 +02:00
Alejandro Fraguas 490aa2ac0f Merge branch 'ent-3783-Error-date-last-contact-snmp-interfaces-view' into 'develop' 
Ent 3783 error date last contact snmp interfaces view

See merge request artica/pandorafms!2316

Former-commit-id: 6959931add69ebb7b1b43c23cd7758024c31a886
 2019-04-02 14:33:14 +02:00
daniel b50901bfd3 Merge branch 'revert-39b80d2c' into 'develop' 
Revert "fixed IPAM config"

See merge request artica/pandorafms!2323

Former-commit-id: 00caaac9361782698f23ae47aad9740927045b0e
 2019-04-02 14:10:00 +02:00
daniel 89bbbd2893 Revert "fixed IPAM config" 
This reverts commit 1fe1beb930 [formerly 39b80d2ca41c21a823cdec5948e30109a81eeb2a]

Former-commit-id: e11aec8e300db083b7ce04cb74d19de276e69eb7
 2019-04-02 14:06:05 +02:00