Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio

2018-06-14 12:17:31 +02:00 · 2018-06-14 12:17:31 +02:00 · 85570dedba
parent 46c23f9deb 3a4f3a38be
commit 85570dedba
32 changed files with 161 additions and 24 deletions
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.724-180613
+Version: 7.0NG.724-180614
 Architecture: all
 Priority: optional
 Section: admin
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-pandora_version="7.0NG.724-180613"
+pandora_version="7.0NG.724-180614"

 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;

 use constant AGENT_VERSION => '7.0NG.724';
-use constant AGENT_BUILD => '180613';
+use constant AGENT_BUILD => '180614';

 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.724
-%define release     180613
+%define release     180614

 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.724
-%define release     180613
+%define release     180614

 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@ -10,7 +10,7 @@
 # **********************************************************************

 PI_VERSION="7.0NG.724"
-PI_BUILD="180613"
+PI_BUILD="180614"
 OS_NAME=`uname -s`

 FORCE=0
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@ -186,7 +186,7 @@ UpgradeApplicationID
 {}

 Version
-{180613}
+{180614}

 ViewReadme
 {Yes}
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;

 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.724(Build 180613)")
+#define PANDORA_VERSION ("7.0NG.724(Build 180614)")

 string pandora_path;
 string pandora_dir;
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@ -11,7 +11,7 @@ BEGIN
      VALUE "LegalCopyright", "Artica ST"
      VALUE "OriginalFilename", "PandoraAgent.exe"
      VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.724(Build 180613))"
+      VALUE "ProductVersion", "(7.0NG.724(Build 180614))"
      VALUE "FileVersion", "1.0.0.0"
    END
  END
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.724-180613
+Version: 7.0NG.724-180614
 Architecture: all
 Priority: optional
 Section: admin
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-pandora_version="7.0NG.724-180613"
+pandora_version="7.0NG.724-180614"

 package_pear=0
 package_pandora=1
--- a/pandora_console/extras/mr/17.sql
+++ b/pandora_console/extras/mr/17.sql
@ -0,0 +1,15 @@
+START TRANSACTION;
+
+CREATE TABLE IF NOT EXISTS `tdatabase` (
+	`id` int(10) unsigned NOT NULL auto_increment,
+	`host` varchar(100) default '',
+	`os_port` int(4) unsigned default '22',
+	`os_user` varchar(100) default '',
+	`db_port` int(4) unsigned default '3306',
+	`status` tinyint(1) unsigned default '0',
+	`action` tinyint(1) unsigned default '0',
+	`last_error` varchar(255) default '',
+	PRIMARY KEY (`id`)
+) ENGINE = InnoDB DEFAULT CHARSET=utf8 ;
+
+COMMIT;
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@ -208,6 +208,21 @@ CREATE TABLE IF NOT EXISTS `tdashboard` (
 	PRIMARY KEY (`id`)
 ) ENGINE = InnoDB DEFAULT CHARSET=utf8;

+-- ---------------------------------------------------------------------
+-- Table `tdatabase`
+-- ---------------------------------------------------------------------
+CREATE TABLE IF NOT EXISTS `tdatabase` (
+	`id` int(10) unsigned NOT NULL auto_increment,
+	`host` varchar(100) default '',
+	`os_port` int(4) unsigned default '22',
+	`os_user` varchar(100) default '',
+	`db_port` int(4) unsigned default '3306',
+	`status` tinyint(1) unsigned default '0',
+	`action` tinyint(1) unsigned default '0',
+	`last_error` varchar(255) default '',
+	PRIMARY KEY (`id`)
+) ENGINE = InnoDB DEFAULT CHARSET=utf8 ;
+
 -- -----------------------------------------------------
 -- Table `twidget`
 -- -----------------------------------------------------
--- a/pandora_console/general/firts_task/HA_cluster_builder.php
+++ b/pandora_console/general/firts_task/HA_cluster_builder.php
@ -0,0 +1,89 @@
+<?php
+// Pandora FMS - http://pandorafms.com
+// ==================================================
+// Copyright (c) 2005-2018 Artica Soluciones Tecnologicas
+// Please see http://pandorafms.org for full contribution list
+
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; version 2
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+global $config;
+
+check_login ();
+
+if (! check_acl ($config['id_user'], 0, "PM")) {
+	db_pandora_audit("ACL Violation",
+		"Trying to access HA cluster");
+	require ("general/noaccess.php");
+	exit;
+}
+
+ui_require_css_file ('firts_task');
+?>
+<?php 
+
+ui_print_info_message ( array('no_close'=>true, 'message'=>  __('There are no HA clusters defined yet.') ) );
+?>
+
+<div class="new_task_cluster">
+	<div class="image_task_cluster">
+		<?php echo html_print_image('images/firts_task/slave-mode.png', true, array("title" => __('Clusters')));?>
+	</div>
+	<div class="text_task_cluster">
+		<h3> <?php echo __('PANDORA FMS DB CLUSTER'); ?></h3>
+		<p id="description_task"> <?php
+    
+    echo __('With Pandora FMS Enterprise you can add high availability to your Pandora FMS installation by adding redundant MySQL servers').'<br><br>';
+    
+    echo __('Click on "add new node" to start transforming your Pandora FMS DB Cluster into a Pandora FMS DB Cluster.').'<br><br>';
+    
+    ?></p>
+		
+		<?php
+			if(check_acl ($config['id_user'], 0, "AW")) {
+				echo "<div id='create_master_window'></div>";
+		?>
+			<input style="margin-bottom:20px;" onclick="show_create_ha_cluster();" type="submit" class="button_task" value="<?php echo __('Add new node'); ?>" />
+		<?php
+			}
+		?>
+	</div>
+</div>
+<script type="text/javascript">
+	function show_create_ha_cluster() {
+		var params = {};
+		params["dialog_master"] = 1;
+		params["page"] = "enterprise/include/ajax/HA_cluster.ajax";
+		jQuery.ajax ({
+			data: params,
+			dataType: "html",
+			type: "POST",
+			url: "ajax.php",
+			success: function (data) {
+				$("#create_master_window").dialog ({
+					title: '<?php echo __("Add master node");?>',
+					resizable: true,
+					draggable: true,
+					modal: true,
+					close: function() {
+						
+					},
+					overlay: {
+						opacity: 0.5,
+						background: "black"
+					},
+					width: 800,
+					height: 600
+				}).empty()
+				.html(data)
+				.show ();
+			}
+		});
+	}
+</script>
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@ -209,6 +209,9 @@ if (check_acl ($config['id_user'], 0, "AW") || check_acl ($config['id_user'], 0,
 	}
 	//This subtabs are only for Pandora Admin
 	if (check_acl ($config['id_user'], 0, "PM")) {
+		
+		enterprise_hook('ha_cluster');
+		
 		$sub["godmode/servers/manage_recontask"]["text"] = __('Recon task');
 		$sub["godmode/servers/manage_recontask"]["id"] = 'Recon task';
 		
--- a/pandora_console/images/clean.disabled.png
+++ b/pandora_console/images/clean.disabled.png
--- a/pandora_console/images/database-master.png
+++ b/pandora_console/images/database-master.png
--- a/pandora_console/images/firts_task/slave-mode.png
+++ b/pandora_console/images/firts_task/slave-mode.png
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@ -22,7 +22,7 @@
 /**
 * Pandora build version and version 
 */
-$build_version = 'PC180613';
+$build_version = 'PC180614';
 $pandora_version = 'v7.0NG.724';

 // Do not overwrite default timezone set if defined.
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.724';
-$build = '180613';
+$build = '180614';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.724
-%define release     180613
+%define release     180614

 # User and Group under which Apache is running
 %define httpd_name  httpd
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.724
-%define release     180613
+%define release     180614
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@ -2235,6 +2235,21 @@ CREATE TABLE IF NOT EXISTS `tdashboard` (
 	PRIMARY KEY (`id`)
 ) ENGINE = InnoDB DEFAULT CHARSET=utf8;

+-- ---------------------------------------------------------------------
+-- Table `tdatabase`
+-- ---------------------------------------------------------------------
+CREATE TABLE IF NOT EXISTS `tdatabase` (
+	`id` int(10) unsigned NOT NULL auto_increment,
+	`host` varchar(100) default '',
+	`os_port` int(4) unsigned default '22',
+	`os_user` varchar(100) default '',
+	`db_port` int(4) unsigned default '3306',
+	`status` tinyint(1) unsigned default '0',
+	`action` tinyint(1) unsigned default '0',
+	`last_error` varchar(255) default '',
+	PRIMARY KEY (`id`)
+) ENGINE = InnoDB DEFAULT CHARSET=utf8 ;
+
 -- -----------------------------------------------------
 -- Table `twidget`
 -- -----------------------------------------------------
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.724-180613
+Version: 7.0NG.724-180614
 Architecture: all
 Priority: optional
 Section: admin
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-pandora_version="7.0NG.724-180613"
+pandora_version="7.0NG.724-180614"

 package_cpan=0
 package_pandora=1
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@ -45,7 +45,7 @@ our @EXPORT = qw(

 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.724";
-my $pandora_build = "180613";
+my $pandora_build = "180614";
 our $VERSION = $pandora_version." ".$pandora_build;

 # Setup hash
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@ -31,7 +31,7 @@ our @ISA = qw(Exporter);

 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.724";
-my $pandora_build = "180613";
+my $pandora_build = "180614";
 our $VERSION = $pandora_version." ".$pandora_build;

 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.724
-%define release     180613
+%define release     180614

 Summary:            Pandora FMS Server
 Name:               %{name}
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.724
-%define release     180613
+%define release     180614

 Summary:            Pandora FMS Server
 Name:               %{name}
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@ -9,7 +9,7 @@
 # **********************************************************************

 PI_VERSION="7.0NG.724"
-PI_BUILD="180613"
+PI_BUILD="180614"

 MODE=$1
 if [ $# -gt 1 ]; then
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;

 # version: define current version
-my $version = "7.0NG.724 PS180613";
+my $version = "7.0NG.724 PS180614";

 # Pandora server configuration
 my %conf;
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;

 # version: define current version
-my $version = "7.0NG.724 PS180613";
+my $version = "7.0NG.724 PS180614";

 # save program name for logging
 my $progname = basename($0);