Commit Graph

3025 Commits

Author SHA1 Message Date
artica aa223aa583 Auto-updated build strings. 2017-04-26 00:01:15 +02:00
vgilc d10b0906ec Merge branch '141-cli-pandora-create_data_module' into 'develop'
fixed error cli pandora-create_data_module

See merge request !405
2017-04-25 17:17:39 +02:00
vgilc d420c98560 Merge branch 'ent-515-Macro-para-SO' into 'develop'
Added macro _agentos_

See merge request !275
2017-04-25 16:18:00 +02:00
artica 4113369680 Updated version and build strings. 2017-04-25 15:35:09 +02:00
daniel f6290d25fa fixed error cli pandora-create_data_module 2017-04-25 13:48:17 +02:00
artica d3f998b081 Auto-updated build strings. 2017-04-25 00:01:17 +02:00
artica e32d353cc2 Revert "Updated version and build strings."
This reverts commit 8c49cfffd7.
2017-04-24 15:59:34 +02:00
artica 8c49cfffd7 Updated version and build strings. 2017-04-24 15:39:47 +02:00
Daniel Maya 3f6adf9f65 Fixed error in cron 2017-04-24 12:39:11 +02:00
artica 0aa6835df7 Auto-updated build strings. 2017-04-24 00:01:12 +02:00
artica 37e1daca9f Auto-updated build strings. 2017-04-23 00:01:13 +02:00
artica 37fcc10551 Auto-updated build strings. 2017-04-22 00:01:56 +02:00
artica f6faa4861b Auto-updated build strings. 2017-04-21 00:01:18 +02:00
artica dd25cff4ec Auto-updated build strings. 2017-04-20 00:01:19 +02:00
Ramon Novoa 25df1acfff Do not chmod +x pandora_server_installer.
Running `chmod +x pandora_server_installer &&
./pandora_server_installer` inside a container causes an error when
using Docker's aufs storage driver.

(cherry picked from commit dc97c29198)
2017-04-19 08:57:13 +02:00
artica 43993e1a14 Auto-updated build strings. 2017-04-19 00:01:21 +02:00
Arturo Gonzalez 1066124678 Merge branch 'develop' into 596-default_event_filter_by_user
Conflicts:
	pandora_agents/unix/DEBIAN/control
	pandora_agents/unix/DEBIAN/make_deb_package.sh
	pandora_agents/unix/pandora_agent
	pandora_agents/unix/pandora_agent.redhat.spec
	pandora_agents/unix/pandora_agent.spec
	pandora_agents/unix/pandora_agent_installer
	pandora_agents/win32/installer/pandora.mpi
	pandora_agents/win32/pandora.cc
	pandora_agents/win32/versioninfo.rc
	pandora_console/DEBIAN/control
	pandora_console/DEBIAN/make_deb_package.sh
	pandora_console/extras/mr/1.sql
	pandora_console/include/config_process.php
	pandora_console/install.php
	pandora_console/pandora_console.redhat.spec
	pandora_console/pandora_console.spec
	pandora_server/DEBIAN/control
	pandora_server/DEBIAN/make_deb_package.sh
	pandora_server/lib/PandoraFMS/Config.pm
	pandora_server/pandora_server.redhat.spec
	pandora_server/pandora_server.spec
	pandora_server/pandora_server_installer
	pandora_server/util/pandora_db.pl
	pandora_server/util/pandora_manage.pl
2017-04-18 11:28:02 +02:00
artica e6a8f6afa2 Auto-updated build strings. 2017-04-18 00:01:21 +02:00
artica 9d0fde648a Auto-updated build strings. 2017-04-17 00:01:21 +02:00
artica 98f61b991a Auto-updated build strings. 2017-04-16 00:01:15 +02:00
artica 5f2884950d Auto-updated build strings. 2017-04-15 00:01:15 +02:00
artica 3dfdfad220 Auto-updated build strings. 2017-04-14 00:01:18 +02:00
artica f081f81569 Auto-updated build strings. 2017-04-13 00:01:18 +02:00
artica b3e1125526 Auto-updated build strings. 2017-04-12 00:01:17 +02:00
artica ac738f682f Auto-updated build strings. 2017-04-11 00:01:17 +02:00
artica ea6deaea04 Auto-updated build strings. 2017-04-10 08:54:41 +02:00
artica b3d6575176 Auto-updated build strings. 2017-04-10 00:01:18 +02:00
artica 20caf87fd5 Auto-updated build strings. 2017-04-09 00:01:19 +02:00
artica 16b0bc83a1 Auto-updated build strings. 2017-04-08 00:01:18 +02:00
vgilc dd5ad8324c Merge branch '686-problema-con-el-Export-server' into 'develop'
fixed problem with alias in export server

See merge request !342
2017-04-07 12:17:01 +02:00
artica 6b0d42c4a4 Auto-updated build strings. 2017-04-07 00:01:16 +02:00
artica 37142657a5 Auto-updated build strings. 2017-04-06 00:01:16 +02:00
artica d25dc0b13a Auto-updated build strings. 2017-04-05 00:01:20 +02:00
Daniel Maya 2ff3d785ba fixed problem with alias in export server 2017-04-04 16:22:48 +02:00
artica 6039772b20 Auto-updated build strings. 2017-04-04 00:01:19 +02:00
artica b769531d16 Auto-updated build strings. 2017-04-03 00:01:17 +02:00
artica 6ca2d24786 Auto-updated build strings. 2017-04-02 00:01:18 +02:00
artica 1121f8ffc5 Auto-updated build strings. 2017-04-01 00:01:18 +02:00
nramon 5036ad9467 Merge branch '560-modificar-la-metaconsola-consola-para-sincronizar-licencias-con-los-nodos' into 'develop'
Metaconsole nodes will always sync the agent cache.

See merge request !333
2017-03-31 14:50:12 +02:00
Ramon Novoa 03b0b3cb33 Metaconsole nodes will always sync the agent cache. 2017-03-31 11:39:25 +02:00
artica 3d1bdc799e Auto-updated build strings. 2017-03-31 00:01:19 +02:00
Ramon Novoa 7f1030abd6 Add support for the new metaconsole licensing mode. 2017-03-30 09:47:00 +02:00
artica da17532889 Auto-updated build strings. 2017-03-30 00:01:18 +02:00
artica a6a9f7eff4 Auto-updated build strings. 2017-03-29 00:01:21 +02:00
artica f81998b294 Auto-updated build strings. 2017-03-28 00:01:18 +02:00
artica 10b145463f Auto-updated build strings. 2017-03-27 00:01:16 +02:00
artica 149e8be750 Auto-updated build strings. 2017-03-26 00:01:17 +01:00
artica d1c4512977 Auto-updated build strings. 2017-03-25 00:01:19 +01:00
Ramon Novoa b574a92f35 Fix a typo. 2017-03-24 11:02:05 +01:00
artica bac8b24853 Auto-updated build strings. 2017-03-24 00:01:21 +01:00
Ramon Novoa e5d29d4c3b Small speed optimization. Check parent_detection from the outer loop. 2017-03-23 16:15:57 +01:00
Ramon Novoa 81fc537426 Merge the Recon module from the Satellite Server. 2017-03-23 14:33:46 +01:00
Ramon Novoa 4886c8ffb7 Disable the VLAN cache by default. 2017-03-23 14:33:46 +01:00
Ramon Novoa c957faad18 Add support for high capacity counters. 2017-03-23 14:33:46 +01:00
artica db7d154aa9 Auto-updated build strings. 2017-03-23 00:01:20 +01:00
daniel a1b3c448a0 fixed macro prevdata for modules type string 2017-03-22 17:52:05 +01:00
artica dc085fa339 Auto-updated build strings. 2017-03-22 00:01:19 +01:00
artica e6ffb47535 Auto-updated build strings. 2017-03-21 00:01:17 +01:00
artica 53837de343 Auto-updated build strings. 2017-03-20 00:01:18 +01:00
artica 6610391bc3 Auto-updated build strings. 2017-03-19 00:01:15 +01:00
artica 40b3c318cd Auto-updated build strings. 2017-03-18 00:01:19 +01:00
fermin831 1d5afbb36a Added _alert_unkown_instructions_ macro 2017-03-17 11:23:28 +01:00
fermin831 65033788f0 Added macro _agentos_ 2017-03-17 09:37:10 +01:00
artica a9cc5cd593 Auto-updated build strings. 2017-03-17 00:01:18 +01:00
artica 41072d8347 Auto-updated build strings. 2017-03-16 00:01:21 +01:00
artica 904e3142c8 Auto-updated build strings. 2017-03-15 00:01:18 +01:00
m-lopez-f ce576441fa Not stop pandora_server service on windows when send XML PARSER error in data consumer. Gitlab: #518 2017-03-14 16:47:09 +01:00
mlopez 75e8926c11 Revert "Only stop service in windows when error not XML PARSER problems. Gitlab: #518"
This reverts commit 4dce98e2d2
2017-03-14 14:30:08 +01:00
m-lopez-f 4dce98e2d2 Only stop service in windows when error not XML PARSER problems. Gitlab: #518 2017-03-14 12:45:50 +01:00
Ramon Novoa a314495a2e Do not reset the progress when multiple subnets are scanned. 2017-03-14 11:51:01 +01:00
Ramon Novoa fcb75ec1aa Clean blanks and HTML entities from recon tasks. 2017-03-14 08:28:12 +01:00
artica 4fb6a26365 Auto-updated build strings. 2017-03-14 00:01:18 +01:00
Ramon Novoa 4a0a9bbd37 Move the Recon module to PandoraFMS. 2017-03-13 11:14:21 +01:00
artica 7890d7bfea Auto-updated build strings. 2017-03-13 00:01:17 +01:00
artica 76fe1bbab6 Auto-updated build strings. 2017-03-12 00:01:18 +01:00
artica 9b45f46af5 Auto-updated build strings. 2017-03-11 00:01:19 +01:00
daniel b7bf236f3c fixed error in macros send mail 2017-03-10 13:51:27 +01:00
Ramon Novoa 472d484583 Fix a typo. 2017-03-10 12:04:35 +01:00
artica c3f3900ee5 Updated version and build strings for the 7.0NG release. 2017-03-10 11:10:28 +01:00
Ramon Novoa a022592e10 Merge the Recon module from the Satellite Server. 2017-03-10 10:36:37 +01:00
Ramon Novoa 4a739775c9 Merge remote-tracking branch 'origin/develop' into feature#new-iface-names 2017-03-10 10:32:46 +01:00
Ramon Novoa 9e7c6612be Merge branch 'develop' into feature#new-iface-names 2017-03-10 10:32:40 +01:00
artica 67a31f8a70 Auto-updated build strings. 2017-03-10 00:01:21 +01:00
daniel e7b14143ed add new macro _homeurl_ 2017-03-09 10:57:03 +01:00
daniel e5c0440d0b fixed errors in mail module_graph 2017-03-09 08:58:53 +01:00
artica cfec08d075 Updated version string to 7.0NG_BETA to avoid problems with package managers. 2017-03-09 08:10:20 +01:00
artica b61f552649 Auto-updated build strings. 2017-03-09 00:01:19 +01:00
Ramon Novoa dff80fed84 Add a new Recon module that will be used by the Satellite Server too. 2017-03-08 13:20:00 +01:00
Ramon Novoa 1efd180726 Document how to test console API settings in pandora_server.conf. 2017-03-08 08:53:35 +01:00
artica 342bcbb4ef Auto-updated build strings. 2017-03-08 00:01:20 +01:00
Hirofumi Kosaka b0d8216965 Fixed a bug that non-master servers had stopped log rotation. 2017-03-07 17:58:25 +09:00
Hirofumi Kosaka c7b33abb07 Fixed a bug that non-master servers had stopped their self-monitoring. 2017-03-07 16:29:52 +09:00
artica 03741b62d9 Auto-updated build strings. 2017-03-07 00:01:16 +01:00
m-lopez-f 43f6181d13 Update gitignore of pandora_console and pandora_server 2017-03-06 10:16:15 +01:00
artica cf5ade4972 Auto-updated build strings. 2017-03-06 09:13:26 +01:00
Ramon Novoa 540d076c9f Merge branch 'develop' into feature#new-iface-names 2017-03-03 08:32:31 +01:00
artica 5e1b14a75a Auto-updated build strings. 2017-03-03 00:01:30 +01:00
Ramon Novoa a14769a683 Add additional parameters to configure dynamic intervals. 2017-03-02 15:02:51 +01:00
Ramon Novoa 12d3c1722b Merge branch 'develop' into feature#new-iface-names 2017-03-02 08:18:19 +01:00
artica 01784bd083 Auto-updated build strings. 2017-03-02 00:01:16 +01:00
artica 8ab66f6d64 Updated version and build strings for the NG BETA release. 2017-03-01 16:01:27 +01:00
artica 02332570de Revert "Updated version and build strings."
This reverts commit 8867a17baf.
2017-03-01 15:25:58 +01:00
artica 8867a17baf Updated version and build strings. 2017-03-01 15:25:30 +01:00
Ramon Novoa 47e17630d1 Merge branch 'develop' into feature#new-iface-names 2017-03-01 15:00:44 +01:00
Ramon Novoa ac3f45e5d3 Add the dynamic_updates configuration option with examples. 2017-03-01 14:59:10 +01:00
fermin831 b5a61c8d12 Permission changed agent and tarball installers 2017-03-01 14:58:28 +01:00
Ramon Novoa 225147770d Merge branch 'develop' into feature#new-iface-names 2017-03-01 12:18:09 +01:00
daniel 5faf2fdaef merge develop in new_ifaces_name 2017-03-01 11:47:38 +01:00
Ramon Novoa 1c88b6370b Make sure the alias is always set. 2017-03-01 11:18:45 +01:00
artica 8d092ef24d Auto-updated build strings. 2017-03-01 00:01:17 +01:00
Ramon Novoa 25db947d20 Change the interface naming convention. 2017-02-28 17:41:10 +01:00
Ramon Novoa 3b8c174b64 Fix some file permissions. 2017-02-28 15:46:20 +01:00
Daniel Maya d95cd086d2 Changed name by alias in the alert message 2017-02-28 11:43:15 +01:00
artica 19dcc729da Auto-updated build strings. 2017-02-28 00:01:17 +01:00
Ramon Novoa 2109fcc875 Update the Tentacle clients. 2017-02-27 16:15:05 +01:00
Ramon Novoa e2022297bb Add a configuration option for the Sync Server's block size. 2017-02-27 16:15:05 +01:00
fbsanchez 7b9ad0cb62 Fixed setgid (rpm & pandora_server_installer) 2017-02-27 13:06:19 +01:00
artica 163b061af0 Auto-updated build strings. 2017-02-27 00:01:16 +01:00
artica ef50808832 Auto-updated build strings. 2017-02-26 00:01:15 +01:00
artica 4d6e26a496 Auto-updated build strings. 2017-02-25 00:01:17 +01:00
Ramon Novoa cdac626174 Add Sync Server SSL configuration parameters to Config.pm.
(cherry picked from commit d569d5b121)
2017-02-24 08:20:09 +01:00
artica 62ab9f0a55 Auto-updated build strings. 2017-02-24 00:01:16 +01:00
nramon 215192a265 Merge branch '186-tentacle-inverso-sync-server' into 'develop'
186 tentacle inverso sync server

See merge request !201
2017-02-23 16:09:28 +01:00
Ramon Novoa a3ab827374 Send at least . and .. when listing files.
Tentacle does not like empty data. Make sure we always send something
when listing files.

(cherry picked from commit 43a7f75343)
2017-02-23 15:45:25 +01:00
artica 39e380097b Auto-updated build strings. 2017-02-23 00:01:18 +01:00
Ramon Novoa bb6ab10fdb Merge branch 'develop' into 186-tentacle-inverso-sync-server 2017-02-22 13:41:36 +01:00
Ramon Novoa 45d2529e38 Merge the tentacle_server with support for insecure operations. 2017-02-22 13:20:35 +01:00
Ramon Novoa 3cada51373 Add a basic implementation of the Sync Server. 2017-02-22 12:59:29 +01:00
artica 54d228c00e Auto-updated build strings. 2017-02-22 00:01:20 +01:00
Alejandro Gallardo Escobar edddad2b5f Now the server uses the alias for the new agent event 2017-02-21 15:16:38 +01:00
Ramon Novoa e3205226e1 Make sure the alias is always set. 2017-02-21 14:24:50 +01:00
Alejandro Gallardo Escobar e7df5ebacb Merge branch 'develop' into feature/alias_friendly_name 2017-02-21 10:12:35 +01:00
artica 028e5c60d2 Auto-updated build strings. 2017-02-21 00:01:17 +01:00
Alejandro Gallardo Escobar 58617c00aa Merge branch 'develop' into feature/alias_friendly_name 2017-02-20 18:52:18 +01:00
Alejandro Gallardo Escobar 3715b9da5d Merge branch 'feature/alias_friendly_name' of https://brutus.artica.lan:8081/artica/pandorafms into feature/alias_friendly_name 2017-02-20 15:33:02 +01:00
Ramon Novoa ce451154db Add an alias to the self-monitoring XML. 2017-02-20 15:18:39 +01:00
Alejandro Gallardo Escobar 545dad643c XMerge branch 'develop' into feature/alias_friendly_name 2017-02-20 12:04:43 +01:00
Arturo Gonzalez 89f0ec658c Added data precision to events. Ticket #288 2017-02-20 09:50:57 +01:00
artica f7fd67ca79 Auto-updated build strings. 2017-02-20 00:01:14 +01:00
artica 2d26efe942 Auto-updated build strings. 2017-02-19 00:01:14 +01:00
artica 1021655e43 Auto-updated build strings. 2017-02-18 00:01:16 +01:00
artica 0677a62be0 Auto-updated build strings. 2017-02-17 00:01:17 +01:00
Daniel Maya d39b108c1f Merge branch 'develop' into feature/alias_freandly_name
Conflicts:
	pandora_agents/unix/pandora_agent
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
	pandora_console/godmode/agentes/agent_manager.php
	pandora_console/godmode/agentes/modificar_agente.php
	pandora_console/godmode/agentes/planned_downtime.editor.php
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/godmode/massive/massive_edit_modules.php
	pandora_console/include/class/Tree.class.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_treeview.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/pandoradb.sql
2017-02-16 16:05:21 +01:00
Ramon Novoa 9fef698df4 Do not add module_parent to extended_info. 2017-02-16 11:44:02 +01:00
artica 96b160adc2 Auto-updated build strings. 2017-02-16 00:01:14 +01:00
artica 7e7713ae04 Auto-updated build strings. 2017-02-15 00:01:14 +01:00
artica 22e81a0c2f Auto-updated build strings. 2017-02-14 00:01:17 +01:00
artica 7b95f9dbfe Auto-updated build strings. 2017-02-13 00:01:13 +01:00
artica 5426cd36f6 Auto-updated build strings. 2017-02-12 00:01:12 +01:00
artica 570bc28301 Auto-updated build strings. 2017-02-11 00:01:16 +01:00
artica 060c6236c4 Auto-updated build strings. 2017-02-10 00:01:14 +01:00
fbsanchez 83ca7e898f Minor fix (performance)
Moved transactional subsystem enabled update to "new module" section
2017-02-09 10:15:50 +01:00
artica 5af516078c Auto-updated build strings. 2017-02-09 00:01:14 +01:00
artica 16f4281de7 Auto-updated build strings. 2017-02-08 00:02:21 +01:00
Ramon Novoa 18a84a7d58 Fix undeclared variables in Core.pm. 2017-02-07 11:22:57 +01:00
Arturo Gonzalez 4e479ccb47 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-02-07 10:42:58 +01:00
Arturo Gonzalez 1f1023db92 Added new fields to alert macros (snmp as well). Ticket #233 2017-02-07 10:41:48 +01:00
artica 4cb1f6466a Auto-updated build strings. 2017-02-07 00:01:16 +01:00
artica d7dc408f4e Auto-updated build strings. 2017-02-06 00:01:14 +01:00
artica 7e65547661 Auto-updated build strings. 2017-02-05 00:01:15 +01:00
artica 4a06176731 Auto-updated build strings. 2017-02-04 00:01:17 +01:00
artica 423a6c434d Auto-updated build strings. 2017-02-03 00:01:19 +01:00
daniel a6fadecd47 add new macro in alerts 2017-02-02 16:11:46 +01:00
Ramon Novoa af276ab7ac Do not constrain UTC time offsets. 2017-02-02 12:50:24 +01:00
artica 707381284e Auto-updated build strings. 2017-02-02 00:01:16 +01:00
daniel 09e1657583 fixed error CLI 2017-02-01 12:47:45 +01:00
artica 295cd3806f Auto-updated build strings. 2017-02-01 00:01:16 +01:00
fbsanchez bcbcb308f7 Removed wmic requirement for pandorafms_server RPM 2017-01-31 18:00:38 +01:00
Arturo Gonzalez b5438effbc Deleted agent version update. Ticket #212 2017-01-31 13:25:21 +01:00
artica 2f7a6f0286 Auto-updated build strings. 2017-01-31 00:01:18 +01:00
artica c3c9189cc0 Auto-updated build strings. 2017-01-30 00:01:16 +01:00
artica 6ad1682ef9 Auto-updated build strings. 2017-01-29 00:01:14 +01:00
artica 5cf006e82e Auto-updated build strings. 2017-01-28 00:01:14 +01:00
artica ce306aa1d6 Auto-updated build strings. 2017-01-27 00:01:16 +01:00
artica 8465cd5266 Auto-updated build strings. 2017-01-26 00:01:16 +01:00
artica 1970167df4 Auto-updated build strings. 2017-01-25 00:01:13 +01:00
artica c4a49f1ac9 Auto-updated build strings. 2017-01-24 00:01:16 +01:00
artica 33301a89d0 Auto-updated build strings. 2017-01-22 00:01:13 +01:00
artica 5042fedfd6 Auto-updated build strings. 2017-01-21 00:01:16 +01:00
vgilc 2086eba5c5 Merge branch '4261_no_meter_archivos_open' into 'pandora_6.0'
fixed errors

See merge request !65
2017-01-20 14:52:14 +01:00
artica f154705317 Auto-updated build strings. 2017-01-20 00:01:17 +01:00
enriquecd 75177057e7 Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-01-19 16:29:00 +01:00
enriquecd 919119e7be Add definition_file content to bd for web modules - #4261 2017-01-19 16:27:53 +01:00
artica fea876396a Auto-updated build strings. 2017-01-19 00:01:12 +01:00
artica e0a3dec263 Auto-updated build strings. 2017-01-18 00:01:11 +01:00
artica 42487d8a6d Auto-updated build strings. 2017-01-17 00:01:13 +01:00
artica 28989fc4db Auto-updated build strings. 2017-01-16 00:01:12 +01:00
artica 3956ce300f Auto-updated build strings. 2017-01-15 00:01:12 +01:00
artica 233fe5e839 Auto-updated build strings. 2017-01-14 00:01:17 +01:00
artica 2773b3f2f9 Auto-updated build strings. 2017-01-13 00:01:15 +01:00
artica c0446bfde0 Auto-updated build strings. 2017-01-12 00:01:15 +01:00
artica 2d872bf2ee Auto-updated build strings. 2017-01-11 00:01:13 +01:00
artica c0f46fbd2f Auto-updated build strings. 2017-01-10 00:01:13 +01:00
artica 1abf229079 Auto-updated build strings. 2017-01-09 00:01:12 +01:00
artica 403e5f6678 Auto-updated build strings. 2017-01-08 00:01:10 +01:00
artica c5074d72aa Auto-updated build strings. 2017-01-07 00:01:12 +01:00
Junichi Satoh e82f31dc02 Improved to be able to pass agent's custom fields to plugin parameters. 2017-01-06 10:56:18 +09:00
artica 71b1322b76 Auto-updated build strings. 2017-01-06 00:01:13 +01:00
artica d9e51bde9a Auto-updated build strings. 2017-01-05 00:01:14 +01:00
artica 013c40fed4 Auto-updated build strings. 2017-01-04 00:01:13 +01:00