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

3868 Commits

Author SHA1 Message Date
artica e614e3ecec Auto-updated build strings. 2018-08-07 00:01:22 +02:00
artica 1367d0e57e Auto-updated build strings. 2018-08-06 00:01:22 +02:00
artica e5e97a304b Auto-updated build strings. 2018-08-05 00:01:21 +02:00
artica 517c98cf1a Auto-updated build strings. 2018-08-04 00:01:25 +02:00
artica 392b5bc935 Auto-updated build strings. 2018-08-03 00:01:25 +02:00
artica d06c0ebffe Auto-updated build strings. 2018-08-02 00:01:23 +02:00
vgilc 86122be7e7 Merge branch '2488-ue-plugin-updates' into 'develop' 
Added extra compat. to print_module (plugintools)

See merge request artica/pandorafms!1620
 2018-08-01 15:20:55 +02:00
artica 1088c5390d Auto-updated build strings. 2018-08-01 00:01:22 +02:00
artica 2dc5bc1139 Auto-updated build strings. 2018-07-31 00:01:23 +02:00
artica 42ad2cc924 Auto-updated build strings. 2018-07-30 00:01:22 +02:00
artica 258f6b915e Auto-updated build strings. 2018-07-29 00:01:20 +02:00
artica 329bcdbc8b Auto-updated build strings. 2018-07-28 00:02:05 +02:00
artica 284f992819 Auto-updated build strings. 2018-07-27 00:01:29 +02:00
artica fb73a0b8b2 Auto-updated build strings. 2018-07-26 00:01:30 +02:00
vgilc 5bfeac1b87 Merge branch '1885-ue-configurador-automatico-de-agentes' into 'develop' 
Added DB changes to support ProvisioningServer 2

See merge request artica/pandorafms!1587
 2018-07-25 11:21:51 +02:00
artica b0434e7f1d Auto-updated build strings. 2018-07-25 00:01:26 +02:00
fbsanchez 05bee8c856 Merge remote-tracking branch 'origin/develop' into 1885-ue-configurador-automatico-de-agentes 2018-07-24 18:43:45 +02:00
artica 7748fcf5ce Updated version and build strings. 2018-07-24 17:45:16 +02:00
daniel 65ff6b260c fixed error pandoradb metapolicies 2018-07-24 13:12:46 +02:00
artica 33dd9d5886 Auto-updated build strings. 2018-07-24 00:01:28 +02:00
fbsanchez 079b2437b6 Merge remote-tracking branch 'origin/develop' into 1885-ue-configurador-automatico-de-agentes 2018-07-23 18:06:02 +02:00
vgilc 44ad0c31d5 Merge branch '2248-5730-Añadir-elementos-a-la-vista-de-eventos' into 'develop' 
Add items to the view events

See merge request artica/pandorafms!1623
 2018-07-23 11:22:23 +02:00
artica 63cc7aab9c Auto-updated build strings. 2018-07-23 00:01:23 +02:00
artica 435d44a1ca Auto-updated build strings. 2018-07-22 00:01:23 +02:00
artica f67616a807 Auto-updated build strings. 2018-07-21 00:01:27 +02:00
Ramon Novoa d102a588eb Add module data and status information to events. 2018-07-20 13:50:56 +02:00
Ramon Novoa 34639ac5c4 Do not update tagente_estado when processing out-of-order data. 
Ref pandora_enterprise#6120.
 2018-07-20 10:41:16 +02:00
artica 0557ecb508 Auto-updated build strings. 2018-07-20 00:01:30 +02:00
fbsanchez 82f3678fdd Minor fix migrate_logs.pl no ticket 2018-07-19 16:38:15 +02:00
artica a21892855a Auto-updated build strings. 2018-07-19 00:01:32 +02:00
fbsanchez 3cc1f815ff Added extra compat. to print_module (plugintools) 2018-07-18 17:56:35 +02:00
artica 9dafb653b4 Auto-updated build strings. 2018-07-18 00:01:27 +02:00
artica fc885be510 Auto-updated build strings. 2018-07-17 00:01:27 +02:00
artica 74eecf1a96 Auto-updated build strings. 2018-07-16 00:01:21 +02:00
artica 04dfd30f76 Auto-updated build strings. 2018-07-15 00:01:27 +02:00
artica 4a7c329481 Auto-updated build strings. 2018-07-14 00:01:32 +02:00
artica 98025188cb Auto-updated build strings. 2018-07-13 00:01:29 +02:00
daniel 86c21aea5d merge develop 2018-07-12 13:37:46 +02:00
vgilc dcad2ef9c7 Merge branch 'ent-2418-GIS-Activar-resolucion-GIS-en-creacion-de-agente-por-IP' into 'develop' 
Fixed recon_reverse_geolocation_file configuration

See merge request artica/pandorafms!1611
 2018-07-12 08:16:48 +02:00
artica 8ab387581d Auto-updated build strings. 2018-07-12 00:01:56 +02:00
fermin831 ecd34f41f8 Fixed recon_reverse_geolocation_file configuration 2018-07-11 18:56:49 +02:00
Ramon Novoa 62ed69af90 Fix the service cascade protection. 2018-07-11 13:07:37 +02:00
artica 1df52459a6 Auto-updated build strings. 2018-07-11 00:01:28 +02:00
artica 49afdcb4fd Auto-updated build strings. 2018-07-10 00:01:27 +02:00
vgilc aaa00bd3ff Merge branch 'ent-2418-GIS-Activar-resolucion-GIS-en-creacion-de-agente-por-IP' into 'develop' 
Ent 2418 gis activar resolucion gis en creacion de agente por ip

See merge request artica/pandorafms!1599
 2018-07-09 15:53:42 +02:00
artica f86465bcf3 Auto-updated build strings. 2018-07-09 00:01:23 +02:00
artica c6390f683e Auto-updated build strings. 2018-07-08 00:01:22 +02:00
artica d30559fffc Auto-updated build strings. 2018-07-07 00:01:26 +02:00
fermin831 f455fe3657 [GeoIP] Added script agent_gis_update.pl 2018-07-06 13:58:45 +02:00
fermin831 4632be803c [GeoIP] Added dependency to open makefile 2018-07-06 09:11:55 +02:00
artica 48e3c547c9 Auto-updated build strings. 2018-07-06 00:01:26 +02:00
fermin831 743d5a4a42 [GeoIP] Added Geo::IP package to server packages 2018-07-05 19:04:13 +02:00
fermin831 3c1f192ab4 [GeoIP] Added geolocalization to Recon and DataServer 2018-07-05 16:43:41 +02:00
fermin831 219988018f [GeoIP] Modified server conf file to remove recon_reverse_geolocation_mode 2018-07-05 15:19:13 +02:00
fermin831 20afc77c87 [GeoIP] Refactorized the ip geolocalization 2018-07-05 15:01:23 +02:00
vgilc e363ea9048 Merge branch 'errata-en-la-configuracion-del-satelite-en-windows' into 'develop' 
Updated the win32 Tentacle binaries.

See merge request artica/pandorafms!1596
 2018-07-05 11:36:17 +02:00
Ramon Novoa 467beb58fd Updated the win32 Tentacle binaries. 2018-07-05 11:29:07 +02:00
artica d1f8aa31fd Auto-updated build strings. 2018-07-05 00:01:27 +02:00
fbsanchez c800061bc2 Autoconfiguration v1 2018-07-04 18:39:06 +02:00
vgilc 5723cfca15 Merge branch 'errata-en-la-configuracion-del-satelite-en-windows' into 'develop' 
Update Tentacle to the latest version.

See merge request artica/pandorafms!1594
 2018-07-04 16:31:59 +02:00
Ramon Novoa 0f4ea33667 Update Tentacle to the latest version. 
Ref pandora_enterprise#2360.
 2018-07-04 12:32:55 +02:00
artica 0ab4ef50c5 Auto-updated build strings. 2018-07-04 00:01:24 +02:00
artica 95678f706b Auto-updated build strings. 2018-07-03 00:01:23 +02:00
artica 61668b4cd7 Auto-updated build strings. 2018-07-02 00:01:25 +02:00
artica 960bc8db31 Auto-updated build strings. 2018-07-01 00:01:26 +02:00
artica bf72f8ec3e Auto-updated build strings. 2018-06-30 00:01:30 +02:00
artica d41df8335c Auto-updated build strings. 2018-06-29 00:01:29 +02:00
nramon e1d41c25b1 Merge branch '2227-plugin-de-ancho-de-banda-mcm-neh' into 'develop' 
2227 plugin de ancho de banda mcm neh

See merge request artica/pandorafms!1579
 2018-06-28 09:04:13 +02:00
artica 73dca0446c Auto-updated build strings. 2018-06-28 00:01:34 +02:00
fbsanchez a57570174c Fix in PluginTools (default value for tentacle port) 2018-06-27 18:54:35 +02:00
slerena 905e6bfc56 Merge branch '2075-Proteccion_en_cascada_de_servicios' into 'develop' 
2075 proteccion en cascada de servicios

See merge request artica/pandorafms!1578
 2018-06-27 18:10:41 +02:00
daniel 8ae27da3b7 add cascade protection services in server 2018-06-27 15:39:13 +02:00
fbsanchez 623afea5fe Minor changes in PluginTools 
Added missing plugins to update_version
 2018-06-27 12:21:21 +02:00
artica f4ef0110b2 Auto-updated build strings. 2018-06-27 00:01:31 +02:00
artica b1b486143f Auto-updated build strings. 2018-06-26 00:01:30 +02:00
artica 17e5c39a67 Auto-updated build strings. 2018-06-25 00:01:24 +02:00
artica 5d4a4eebc4 Auto-updated build strings. 2018-06-24 00:01:25 +02:00
artica b467eea16b Auto-updated build strings. 2018-06-23 00:01:25 +02:00
artica 0a61a5f5d3 Auto-updated build strings. 2018-06-22 00:01:24 +02:00
artica f40e3883ec Auto-updated build strings. 2018-06-21 00:01:26 +02:00
artica c97530a4ee Updated version and build strings. 2018-06-20 15:19:39 +02:00
artica 2c6ad942cb Auto-updated build strings. 2018-06-20 00:01:24 +02:00
fbsanchez f7522fcf3f Allowed https connections with consoles with self-signed certificates 2018-06-19 16:48:04 +02:00
Ramon Novoa ad687b3823 Added HA config parameters to pandora_server.conf. 2018-06-19 12:20:02 +02:00
nramon 2071568b16 Merge branch '2016-plugin-monitorizacion-con-docker-swarm' into 'develop' 
Functionalities added - docker swarm

See merge request artica/pandorafms!1547
 2018-06-19 11:33:07 +02:00
artica 8d39712be4 Auto-updated build strings. 2018-06-19 00:01:25 +02:00
fbsanchez 8e2c5bf5cb Functionalities added - docker swarm 2018-06-18 20:47:58 +02:00
artica b29dd4eb8a Auto-updated build strings. 2018-06-18 00:01:21 +02:00
artica a47f7b7e97 Auto-updated build strings. 2018-06-17 00:01:21 +02:00
artica 2926c7789e Auto-updated build strings. 2018-06-16 00:01:21 +02:00
artica 76bc8ad280 Auto-updated build strings. 2018-06-15 00:01:24 +02:00
artica d7f59d4fd3 Auto-updated build strings. 2018-06-14 00:01:24 +02:00
artica 7a26aa3b38 Auto-updated build strings. 2018-06-13 00:01:26 +02:00
artica e4461273ab Updated version and build strings. 2018-06-12 17:28:15 +02:00
fermin831 27700d820e Added trace with module id to tcp network server checks 2018-06-12 16:09:04 +02:00
artica 5574ddd205 Auto-updated build strings. 2018-06-12 00:01:39 +02:00
artica 10e95bf447 Auto-updated build strings. 2018-06-10 00:01:23 +02:00
artica 14dd0e222b Auto-updated build strings. 2018-06-09 00:01:27 +02:00
artica 937cfb7d1e Auto-updated build strings. 2018-06-08 00:01:27 +02:00
artica 18e047d25e Auto-updated build strings. 2018-06-07 00:01:25 +02:00
artica 3fbdd3d026 Auto-updated build strings. 2018-06-06 00:01:25 +02:00
artica db4ce74311 Auto-updated build strings. 2018-06-05 00:01:23 +02:00
vgilc b620c1e7d9 Merge branch '2016-plugin-monitorizacion-con-docker-swarm' into 'develop' 
Minor fix in plugintools api_methods

See merge request artica/pandorafms!1484
 2018-06-04 10:19:56 +02:00
vgilc e0f5fae11a Merge branch 'pandora_enterprise#2274-mejoras-recon-onenet' into 'develop' 
Improvements to the Pandora FMS Recon Server.

See merge request artica/pandorafms!1485
 2018-06-04 10:18:18 +02:00
vgilc d8b219802c Merge branch 'ent-1068-permisos-por-defecto-apache-var-log-pandora' into 'develop' 
Fixed permissions in default log folders

See merge request artica/pandorafms!1510
 2018-06-04 10:17:43 +02:00
artica 77ccbe46a9 Auto-updated build strings. 2018-06-04 00:01:20 +02:00
artica 8138c2f8ae Auto-updated build strings. 2018-06-03 00:01:19 +02:00
artica 57ef534909 Auto-updated build strings. 2018-06-02 00:01:26 +02:00
artica ec050ba606 Auto-updated build strings. 2018-06-01 00:01:21 +02:00
fermin831 9561feaf5c Fixed permissions in default log folders 2018-05-31 20:16:09 +02:00
artica e1cba85c6e Auto-updated build strings. 2018-05-31 00:01:21 +02:00
fermin831 5c6e22c9b6 [Rebranding] Remove delete environment vars and fixed pandora_db redefinitions 2018-05-30 11:08:48 +02:00
artica 7147667d8c Auto-updated build strings. 2018-05-30 00:01:21 +02:00
fermin831 0a2c744ef0 [Rebranding] Modified daemon to load environment vars 2018-05-29 17:32:24 +02:00
fermin831 aa6d931331 [Rebranding] Modified server source events by generic monitoring_event 2018-05-29 17:10:05 +02:00
fermin831 53cbc4ebde [Rebranding] Fixed missing include in pandora_db 2018-05-29 16:50:30 +02:00
artica aa1e7ff4d2 Auto-updated build strings. 2018-05-29 00:01:28 +02:00
artica 01cce15955 Updated version and build strings. 2018-05-28 13:20:38 +02:00
vgilc 8cb5dea3d9 Merge branch '194-async-recovery' into 'develop' 
I fixed the bug about async_recovery.

Closes #194

See merge request artica/pandorafms!1493
 2018-05-28 12:50:28 +02:00
fermin831 88e060893a Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts resolved:
	pandora_console/operation/events/events_rss.php
 2018-05-28 12:12:16 +02:00
artica 2e4b320861 Auto-updated build strings. 2018-05-28 00:01:21 +02:00
artica 9ff98af9a5 Auto-updated build strings. 2018-05-27 00:01:26 +02:00
artica edd38ac9c8 Auto-updated build strings. 2018-05-26 00:01:24 +02:00
fermin831 7afc617e62 [Rebranding] Implemented server rebranding through environment vars 2018-05-25 12:39:30 +02:00
artica 643a07a163 Auto-updated build strings. 2018-05-25 00:01:22 +02:00
fermin831 66dfd9b171 [Rebranding] Change alert action Pandora FMS Event to Monitoring Event 2018-05-24 11:16:30 +02:00
artica bd48fe4fe6 Auto-updated build strings. 2018-05-24 00:01:24 +02:00
nknsh 4a58b8cb7d I fixed the bug about async_recovery. 
When the async module recovers automatically, known_status and last_known_status are updated to 0.
 2018-05-23 13:49:14 +09:00
artica e015354a99 Auto-updated build strings. 2018-05-23 00:01:24 +02:00
fermin831 e71fd399fb Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts:
	pandora_console/godmode/admin_access_logs.php
	pandora_console/include/javascript/functions_pandora_networkmap.js
 2018-05-22 19:29:46 +02:00
fbsanchez ef778f296c PluginTools Added get_value_translated 2018-05-22 17:18:11 +02:00
fbsanchez a5be501f4d Merge remote-tracking branch 'origin/develop' into 2016-plugin-monitorizacion-con-docker-swarm 2018-05-22 11:41:29 +02:00
artica 4b197ab61a Auto-updated build strings. 2018-05-22 00:01:31 +02:00
fbsanchez a82299f1cf PluginTools minor changes 
API cluster minor changes
 2018-05-21 18:08:36 +02:00
Ramon Novoa 8bda3751df Improvements to the Pandora FMS Recon Server. 
- Ignore virtual interfaces.
- Improved scan of ARP caches.
 2018-05-21 15:03:54 +02:00
fbsanchez 2ab45d28b8 Added api_get_agent_id (API) updated plugintools 2018-05-21 14:42:27 +02:00
fbsanchez 9d1872b2d1 Minor fix in plugintools api_methods 2018-05-21 11:10:05 +02:00
artica dff20a609b Auto-updated build strings. 2018-05-21 00:01:23 +02:00
artica 4a6859aeae Auto-updated build strings. 2018-05-20 00:01:22 +02:00
artica b7ce2f2dc8 Auto-updated build strings. 2018-05-19 00:01:38 +02:00
artica f3509d285a Auto-updated build strings. 2018-05-18 00:01:28 +02:00
fermin831 477fc9d22a [Rebranding] pandora_db 2018-05-17 18:38:26 +02:00
fermin831 cc26124289 Rebranding open server 2018-05-17 16:12:44 +02:00
artica a79f3b2d05 Auto-updated build strings. 2018-05-17 00:01:23 +02:00
artica 5f8e010d01 Auto-updated build strings. 2018-05-16 00:01:21 +02:00
artica 007715fb93 Auto-updated build strings. 2018-05-15 00:01:26 +02:00
artica 3e8f9cbb34 Auto-updated build strings. 2018-05-14 00:01:23 +02:00
artica d63f316042 Auto-updated build strings. 2018-05-13 00:02:13 +02:00
artica 65f9fe1cb7 Auto-updated build strings. 2018-05-11 00:01:26 +02:00
artica e9d8af152d Auto-updated build strings. 2018-05-10 00:01:25 +02:00
Ramon Novoa 1abba49c70 Create the extras directory. 2018-05-09 10:57:54 +02:00
vgilc 118bed56fe Merge branch 'ent-2100-Mejorar-descripcion-de-errores-en-el-TENTACLE-SERVER' into 'develop' 
Now tentacle server errors are more descriptives

See merge request artica/pandorafms!1454
 2018-05-09 10:21:18 +02:00
vgilc 30417cd2fe Merge branch 'ent-2146-Configuracion-Tentacle' into 'develop' 
Ent 2146 configuracion tentacle

See merge request artica/pandorafms!1455
 2018-05-09 10:11:58 +02:00
artica 04e3d3071d Auto-updated build strings. 2018-05-09 00:01:23 +02:00
artica 3377ecfd64 Auto-updated build strings. 2018-05-08 00:01:23 +02:00
artica e0cf024990 Auto-updated build strings. 2018-05-07 00:01:21 +02:00
artica 6dd28d2d75 Auto-updated build strings. 2018-05-06 00:01:21 +02:00
artica b92d9c9560 Auto-updated build strings. 2018-05-05 00:01:23 +02:00
artica 770267d72e Auto-updated build strings. 2018-05-04 00:01:21 +02:00
artica ab1ca78340 Auto-updated build strings. 2018-05-02 00:01:34 +02:00
artica d6a7ca198d Auto-updated build strings. 2018-05-01 00:01:23 +02:00
fermin831 b6bc835e41 Tentacle config file is readable to all users in all packages 2018-04-30 16:22:52 +02:00
fermin831 4bc10e503b Modified launch daemon Tentacle script to use configuration file 2018-04-30 15:53:09 +02:00
fermin831 0699f261ad Added tentacle configuration file to Debian package 2018-04-30 13:49:42 +02:00
fermin831 970a4ac4ee Added tentacle configuration file to SUSE RPM 2018-04-30 13:11:38 +02:00
artica 235f20ef86 Auto-updated build strings. 2018-04-30 00:01:56 +02:00
artica 9b1d62f999 Auto-updated build strings. 2018-04-29 00:02:00 +02:00
artica a1fa3a4ee8 Auto-updated build strings. 2018-04-28 00:01:34 +02:00
fermin831 fdf6455b74 Added tentacle configuration file to RedHat RPM 2018-04-27 14:10:01 +02:00
fermin831 6ea41e3a94 Added tentacle configuration file to open tarball 2018-04-27 13:09:51 +02:00
fermin831 1bf0fa6e02 Moved tentacle configuration file 2018-04-27 12:13:01 +02:00
fermin831 3526ea25f9 Updated windows tentacle to 0.6.2 version 2018-04-27 10:21:07 +02:00
fermin831 1fa309516f Added all configuration options and a sample configuration file of tentacle server 2018-04-27 09:26:56 +02:00
artica 7252b8f172 Auto-updated build strings. 2018-04-27 00:01:31 +02:00
fermin831 979e7fa8b5 Added parse configuration file to tentacle server 2018-04-26 15:43:47 +02:00
fermin831 45daae5b64 Now tentacle server errors are more descriptives 2018-04-26 13:35:05 +02:00
artica edacc90226 Auto-updated build strings. 2018-04-26 00:01:26 +02:00
artica ec61441587 Auto-updated build strings. 2018-04-25 00:01:32 +02:00
artica de2b583583 Auto-updated build strings. 2018-04-24 00:01:30 +02:00
enriquecd b4b6852e27 Change id_os number refence and add get_cluster status function in api and CLI - #2007 2018-04-23 13:52:16 +02:00
artica d90c78ad9d Auto-updated build strings. 2018-04-23 00:01:25 +02:00
artica 1dc4b4554a Auto-updated build strings. 2018-04-22 00:01:25 +02:00
artica 1cf7efb86b Auto-updated build strings. 2018-04-21 00:01:35 +02:00
enriquecd d78c8daf5b Merge branch 'develop' into 2007-Monitorizacion-de-cluster-fase-2-cli-2 
Conflicts:
	pandora_server/util/pandora_manage.pl
 2018-04-20 10:19:16 +02:00
artica 235c1cee6c Auto-updated build strings. 2018-04-20 00:01:27 +02:00
artica 418d8b12b7 Updated version and build strings. 2018-04-19 16:05:39 +02:00
artica ee0d890361 Auto-updated build strings. 2018-04-19 00:01:25 +02:00
artica 3c8914a331 Auto-updated build strings. 2018-04-18 00:01:29 +02:00
artica bc251e58df Auto-updated build strings. 2018-04-17 00:01:28 +02:00
artica cb5c3016dc Auto-updated build strings. 2018-04-16 00:01:23 +02:00
artica 2ab79ce5e4 Auto-updated build strings. 2018-04-15 00:01:24 +02:00
artica 738b1fdd68 Auto-updated build strings. 2018-04-14 00:01:27 +02:00
artica 9f2aa451fb Auto-updated build strings. 2018-04-13 00:01:25 +02:00
artica 92fb527ff8 Auto-updated build strings. 2018-04-12 00:01:23 +02:00
artica 1ecfd4669e Auto-updated build strings. 2018-04-11 00:01:26 +02:00
artica a67a4288a1 Updated version and build strings. 2018-04-10 10:18:25 +02:00
fermin831 60f7a0ab79 Merge branch 'develop' into 2015-implementacion-de-grupos-secundarios 
Conflicts:
	pandora_console/include/class/Tree.class.php
 2018-04-10 09:29:14 +02:00
artica e2b52a76f7 Auto-updated build strings. 2018-04-10 00:01:23 +02:00
enriquecd 11182e9989 Merge branch 'develop' into 2101-Comprobar-funciones-de-CLI-ceadas-el-de-integria-4261-fix-wiki 
Conflicts:
	pandora_server/util/pandora_manage.pl
 2018-04-09 11:48:56 +02:00
enriquecd 2c223f4d10 Add cli cluster functions - #2007 2018-04-09 11:43:41 +02:00