From 6a68c40edfff0f9e46143839490300ba1ae72050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Su=C3=A1rez?= Date: Wed, 31 May 2023 23:40:46 -0600 Subject: [PATCH 1/9] Changes to show moduletags and policy in macros --- pandora_server/lib/PandoraFMS/Core.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 06deaa4331..c3f833908d 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -4867,9 +4867,10 @@ sub on_demand_macro($$$$$$;$) { return ''; } elsif ($macro eq '_moduletags_') { - return (defined ($module)) ? pandora_get_module_url_tags ($pa_config, $dbh, $module->{'id_agente_modulo'}) : ''; + return (defined ($module)) ? pandora_get_module_tags ($pa_config, $dbh, $module->{'id_agente_modulo'}) : ''; } elsif ($macro eq '_policy_') { - return (defined ($alert)) ? enterprise_hook('get_policy_name_policy_alerts_id', [$dbh, $alert->{'id_policy_alerts'}]) : ''; + my $policy_name = get_db_value($dbh, 'SELECT p.name FROM tpolicy_modules AS pm, tpolicies AS p WHERE pm.id_policy = p.id AND pm.id = ?;', $module->{'id_policy_module'}); + return (defined ($policy_name)) ? $policy_name : ''; } elsif ($macro eq '_email_tag_') { return (defined ($module)) ? pandora_get_module_email_tags ($pa_config, $dbh, $module->{'id_agente_modulo'}) : ''; } elsif ($macro eq '_phone_tag_') { From 26309c8baee3202761b86ed9b18e5df363590897 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Mon, 5 Jun 2023 16:33:20 +0200 Subject: [PATCH 2/9] #11420 Fixed img --- .../godmode/servers/servers.build_table.php | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php index 8d2418cc5e..861a507143 100644 --- a/pandora_console/godmode/servers/servers.build_table.php +++ b/pandora_console/godmode/servers/servers.build_table.php @@ -255,17 +255,7 @@ foreach ($servers as $server) { if (($names_servers[$safe_server_name] === true) && ($server['type'] === 'data' || $server['type'] === 'enterprise satellite')) { $data[8] .= ''; - $data[8] .= html_print_image( - 'images/agents@svg.svg', - true, - [ - 'title' => __('Manage server conf'), - 'class' => 'main_menu_icon invert_filter', - ] - ); - $data[8] .= ''; - - $data[8] .= ''; + $data[8] .= ''; $data[8] .= html_print_image( 'images/remote-configuration@svg.svg', true, From 6ca91b89ec6f2907da0dc3cd7ac58679ea6bf219 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Mon, 12 Jun 2023 16:28:57 +0200 Subject: [PATCH 3/9] #11493 Added agent hive --- .../include/lib/Dashboard/Widget.php | 1 + .../lib/Dashboard/Widgets/AgentHive.php | 514 ++++++++++++++++++ pandora_console/include/styles/dashboards.css | 53 ++ 3 files changed, 568 insertions(+) create mode 100644 pandora_console/include/lib/Dashboard/Widgets/AgentHive.php diff --git a/pandora_console/include/lib/Dashboard/Widget.php b/pandora_console/include/lib/Dashboard/Widget.php index 245c9f0481..b9e9971507 100644 --- a/pandora_console/include/lib/Dashboard/Widget.php +++ b/pandora_console/include/lib/Dashboard/Widget.php @@ -424,6 +424,7 @@ class Widget case 'ModulesByStatus': case 'AvgSumMaxMinModule': case 'BasicChart': + case 'AgentHive': $className .= '\\'.$name; break; diff --git a/pandora_console/include/lib/Dashboard/Widgets/AgentHive.php b/pandora_console/include/lib/Dashboard/Widgets/AgentHive.php new file mode 100644 index 0000000000..7e734ce24b --- /dev/null +++ b/pandora_console/include/lib/Dashboard/Widgets/AgentHive.php @@ -0,0 +1,514 @@ +width = $width; + + // Height. + $this->height = $height; + + // Grid Width. + $this->gridWidth = $gridWidth; + + // Cell Id. + $this->cellId = $cellId; + + // Options. + $this->values = $this->decoders($this->getOptionsWidget()); + + // Page. + $this->page = basename(__FILE__); + + // ClassName. + $class = new \ReflectionClass($this); + $this->className = $class->getShortName(); + + // Title. + $this->title = __('Agent hive'); + + // Name. + if (empty($this->name) === true) { + $this->name = 'AgentHive'; + } + + // This forces at least a first configuration. + $this->configurationRequired = false; + if (empty($this->values['groups']) === true) { + $this->configurationRequired = true; + } + } + + + /** + * Decoders hack for retrocompability. + * + * @param array $decoder Values. + * + * @return array Returns the values ​​with the correct key. + */ + public function decoders(array $decoder): array + { + $values = []; + // Retrieve global - common inputs. + $values = parent::decoders($decoder); + + if (isset($decoder['groups']) === true) { + $values['groups'] = $decoder['groups']; + } + + return $values; + } + + + /** + * Generates inputs for form (specific). + * + * @return array Of inputs. + * + * @throws Exception On error. + */ + public function getFormInputs(): array + { + $values = $this->values; + + // Retrieve global - common inputs. + $inputs = parent::getFormInputs(); + + // Filters. + $inputs[] = [ + 'label' => __('Groups'), + 'id' => 'li_groups', + 'arguments' => [ + 'type' => 'select_groups', + 'name' => 'groups[]', + 'returnAllGroup' => false, + 'privilege' => 'AR', + 'selected' => explode(',', $values['groups'][0]), + 'return' => true, + 'multiple' => true, + 'required' => true, + ], + ]; + + return $inputs; + } + + + /** + * Get Post for widget. + * + * @return array + */ + public function getPost(): array + { + // Retrieve global - common inputs. + $values = parent::getPost(); + + $values['groups'] = \get_parameter('groups', 0); + + return $values; + } + + + /** + * Draw widget. + * + * @return string; + */ + public function load() + { + global $config; + + $groups = $this->values['groups']; + $groups = explode(',', $groups[0]); + + $user_groups = array_keys( + users_get_groups( + false, + 'AR', + false, + false, + $groups + ) + ); + + foreach ($groups as $key => $group) { + if (in_array($group, $user_groups) === false) { + unset($groups[$key]); + } + } + + $table = 'tagente'; + if (is_metaconsole()) { + $table = 'tmetaconsole_agent'; + } + + $sql = sprintf( + 'SELECT * FROM %s WHERE id_grupo IN('.implode(',', $groups).')', + $table + ); + $all_agents = db_get_all_rows_sql($sql); + + $output = ''; + $output .= '
'; + foreach ($all_agents as $agent) { + $output .= $this->drawSquare($agent); + } + + $output .= '
'; + + $output .= ''; + + return $output; + } + + + /** + * Draw square agent. + * + * @param array $data Info agent. + * + * @return string Output. + */ + private function drawSquare(array $data): string + { + global $config; + + $id = (is_metaconsole() === true) + ? $data['id_tagente'] + : $data['id_agente']; + + $status = agents_get_status_from_counts($data); + switch ($status) { + case 1: + case 4: + case 100: + // Critical (BAD or ALERT). + $color = '#e63c52'; + break; + + case 0: + case 300: + // Normal (OK). + $color = '#82b92e'; + break; + + case 2: + case 200: + // Warning. + $color = '#f3b200'; + break; + + case 5: + // Not init. + $color = '#4a83f3'; + break; + + default: + // Default is Grey (Other). + $color = '#b2b2b2'; + break; + } + + $style_contact = 'flex-grow: 9; font-size: 8pt; display: flex; + justify-content: start;align-items: start; color: #9FA5B1; font-weight: 600;'; + // Last contact. + $lastContactDate = ui_print_timestamp( + $data['ultimo_contacto'], + true, + ['style' => $style_contact] + ); + + // Url. + $console_url = ui_get_full_url('/'); + if (is_metaconsole()) { + $server = metaconsole_get_servers($data['id_tmetaconsole_setup']); + $console_url = $server['server_url'].'/'; + } + + $url_view = $console_url.'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$id; + $url_manage = $console_url.'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id; + + $output = '
'; + $output .= ''; + $output .= '
'; + $output .= '
'; + // Last contact and img. + $output .= '
'; + $output .= $lastContactDate; + $output .= ''.html_print_image( + 'images/configuration@svg.svg', + true, + [ + 'title' => __('Operation view'), + 'class' => 'main_menu_icon invert_filter', + 'style' => 'flex-grow: 1', + 'id' => 'img_'.$id, + ] + ).''; + $output .= '
'; + + // OS and alias. + $output .= '
'; + $output .= ui_print_os_icon( + $data['id_os'], + false, + true, + true, + false, + false, + false, + ['style' => 'margin-right: 5px;'] + ); + $output .= ui_print_truncate_text( + ucfirst(io_safe_output($data['alias'])), + 12, + false, + true, + true, + '…', + 'font-size: 11pt;color: #14524f; + font-weight: 600;text-align: left', + ); + + $output .= '
'; + + // OS description. + $output .= html_print_div( + [ + 'content' => (empty($data['os_version']) === true) + ? get_os_name((int) $data['id_os']) + : $data['os_version'], + 'style' => 'font-size: 6pt; display: + flex;justify-content: start;align-items: start; + color: #9FA5B1; font-weight: 600;margin-bottom: 5px', + ], + true + ); + + // Description. + $output .= html_print_div( + [ + 'content' => ui_print_truncate_text( + io_safe_output($data['comentarios']), + 38, + false, + true, + true, + '…', + ), + 'style' => 'text-align: left;min-height: 42px; + font-size: 8pt;max-height: 42px; margin-bottom: 10px', + ], + true + ); + + // IP. + $output .= html_print_div( + [ + 'content' => $data['direccion'], + 'style' => 'font-size: 10pt;color: #14524f; + font-weight: 600; text-align: left', + ], + true + ); + $output .= '
'; + $output .= '
'; + + return $output; + + } + + + /** + * Get description. + * + * @return string. + */ + public static function getDescription() + { + return __('Agents hive'); + } + + + /** + * Get Name. + * + * @return string. + */ + public static function getName() + { + return 'AgentHive'; + } + + + /** + * Get size Modal Configuration. + * + * @return array + */ + public function getSizeModalConfiguration(): array + { + $size = [ + 'width' => (is_metaconsole() === true) ? 700 : 600, + 'height' => 610, + ]; + + return $size; + } + + +} diff --git a/pandora_console/include/styles/dashboards.css b/pandora_console/include/styles/dashboards.css index 908f673997..61c5235911 100644 --- a/pandora_console/include/styles/dashboards.css +++ b/pandora_console/include/styles/dashboards.css @@ -654,6 +654,59 @@ form.modal-dashboard font-style: italic; } +.widget-agent-hive-square { + flex: 1; + display: flex; + flex-direction: row; + justify-content: center; + align-items: start; + min-width: 150px; + max-width: 150px; + min-height: 150px; + max-height: 150px; + margin: 8px; + padding: 5px; + border: 1px solid #eceef2; + border-radius: 5px; + cursor: pointer; +} + +.widget-agent-hive-square-status { + width: 3%; + height: 100%; + margin-left: 4%; + margin-right: 3%; + border-radius: 15px; +} + +.widget-agent-hive-square-info { + width: 90%; + height: 100%; + display: flex; + flex-direction: column; +} + +.widget-agent-hive-square-info-header { + width: 100%; + display: flex; + flex-direction: row; + margin-bottom: 10px; +} + +.widget-agent-hive-square-info-body { + width: 100%; + display: flex; + flex-direction: row; +} + +.span-alias { + font-size: 13pt; + justify-content: start; + align-items: start; + color: #14524f; + font-weight: 600; +} + .container-histograms { min-width: 400px; } From c28730a08103d34b46ad10e07d1040eb1764c496 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Mon, 19 Jun 2023 17:31:26 +0200 Subject: [PATCH 4/9] #11493 Fixed color --- .../lib/Dashboard/Widgets/AgentHive.php | 22 +++++++++++-------- pandora_console/include/styles/dashboards.css | 1 + 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/pandora_console/include/lib/Dashboard/Widgets/AgentHive.php b/pandora_console/include/lib/Dashboard/Widgets/AgentHive.php index 7e734ce24b..d41ef6df68 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/AgentHive.php +++ b/pandora_console/include/lib/Dashboard/Widgets/AgentHive.php @@ -308,6 +308,8 @@ class AgentHive extends Widget window.open(url); } }); + + $("div [id*=hiveImg_] svg path").css("fill", "#99A3BE"); }); '; @@ -403,16 +405,18 @@ class AgentHive extends Widget // OS and alias. $output .= '
'; - $output .= ui_print_os_icon( - $data['id_os'], - false, - true, - true, - false, - false, - false, - ['style' => 'margin-right: 5px;'] + $icon = (string) db_get_value( + 'icon_name', + 'tconfig_os', + 'id_os', + (int) $data['id_os'] ); + $output .= '
'; + $output .= file_get_contents( + ui_get_full_url('images/'.$icon) + ); + $output .= '
'; $output .= ui_print_truncate_text( ucfirst(io_safe_output($data['alias'])), 12, diff --git a/pandora_console/include/styles/dashboards.css b/pandora_console/include/styles/dashboards.css index 61c5235911..35f83388f9 100644 --- a/pandora_console/include/styles/dashboards.css +++ b/pandora_console/include/styles/dashboards.css @@ -684,6 +684,7 @@ form.modal-dashboard height: 100%; display: flex; flex-direction: column; + margin-left: 5px; } .widget-agent-hive-square-info-header { From c333ffcf0adeddf301778dde16cdf64531daaf1c Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Mon, 17 Jul 2023 08:59:32 +0200 Subject: [PATCH 5/9] #11420 fixed url and added buttons --- pandora_console/godmode/servers/modificar_server.php | 2 +- pandora_console/godmode/servers/servers.build_table.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php index cb99f3b4ef..6d3e672334 100644 --- a/pandora_console/godmode/servers/modificar_server.php +++ b/pandora_console/godmode/servers/modificar_server.php @@ -212,7 +212,7 @@ if (isset($_GET['server']) === true) { false, 'servers', true, - [], + $buttons, [ [ 'link' => '', diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php index 861a507143..872aa33e6a 100644 --- a/pandora_console/godmode/servers/servers.build_table.php +++ b/pandora_console/godmode/servers/servers.build_table.php @@ -255,7 +255,7 @@ foreach ($servers as $server) { if (($names_servers[$safe_server_name] === true) && ($server['type'] === 'data' || $server['type'] === 'enterprise satellite')) { $data[8] .= ''; - $data[8] .= ''; + $data[8] .= ''; $data[8] .= html_print_image( 'images/remote-configuration@svg.svg', true, From 8d89ed90d3825ba4b6885e639f4e099e12bd1a15 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Mon, 17 Jul 2023 09:34:57 +0200 Subject: [PATCH 6/9] #11735 Fix Agent view modules --- pandora_console/include/ajax/module.php | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php index 0ab70681df..8cc2eca4a5 100755 --- a/pandora_console/include/ajax/module.php +++ b/pandora_console/include/ajax/module.php @@ -98,15 +98,18 @@ if (check_login()) { } $id_plugin = get_parameter('id_plugin', 0); - $id_module_plugin = db_get_value( - 'id_plugin', - 'tagente_modulo', - 'id_agente_modulo', - $get_module_macros - ); - if ($id_plugin !== $id_module_plugin) { - $get_plugin_macros = true; - $get_module_macros = 0; + + if ($id_plugin !== 0) { + $id_module_plugin = db_get_value( + 'id_plugin', + 'tagente_modulo', + 'id_agente_modulo', + $get_module_macros + ); + if ($id_plugin !== $id_module_plugin) { + $get_plugin_macros = true; + $get_module_macros = 0; + } } if ($get_plugin_macros) { From 37b1c94b45073f4041a1857ff2f4f86378c6f096 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Mon, 17 Jul 2023 11:53:14 +0200 Subject: [PATCH 7/9] #11493 Fixed icon --- .../include/lib/Dashboard/Widgets/AgentHive.php | 7 ++++--- pandora_console/include/styles/dashboards.css | 7 +++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pandora_console/include/lib/Dashboard/Widgets/AgentHive.php b/pandora_console/include/lib/Dashboard/Widgets/AgentHive.php index d41ef6df68..3b881ca344 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/AgentHive.php +++ b/pandora_console/include/lib/Dashboard/Widgets/AgentHive.php @@ -414,7 +414,7 @@ class AgentHive extends Widget $output .= '
'; $output .= file_get_contents( - ui_get_full_url('images/'.$icon) + ui_get_full_url('images/'.$icon, false, false, false) ); $output .= '
'; $output .= ui_print_truncate_text( @@ -424,8 +424,9 @@ class AgentHive extends Widget true, true, '…', - 'font-size: 11pt;color: #14524f; - font-weight: 600;text-align: left', + 'font-size: 11pt;color: #14524f;white-space: nowrap; + font-weight: 600;text-align: left;width: 80%; + overflow: hidden;', ); $output .= '
'; diff --git a/pandora_console/include/styles/dashboards.css b/pandora_console/include/styles/dashboards.css index 35f83388f9..285e8fa481 100644 --- a/pandora_console/include/styles/dashboards.css +++ b/pandora_console/include/styles/dashboards.css @@ -674,17 +674,16 @@ form.modal-dashboard .widget-agent-hive-square-status { width: 3%; height: 100%; - margin-left: 4%; - margin-right: 3%; + margin-left: 3%; border-radius: 15px; } .widget-agent-hive-square-info { - width: 90%; + width: 87%; height: 100%; display: flex; flex-direction: column; - margin-left: 5px; + margin-left: 6%; } .widget-agent-hive-square-info-header { From a0dc60a49fd1e116c9b99ea6f0eef8964871e19b Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Mon, 17 Jul 2023 14:57:54 +0200 Subject: [PATCH 8/9] #11493 Added png --- pandora_console/images/widgets/AgentHive.png | Bin 0 -> 5426 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 pandora_console/images/widgets/AgentHive.png diff --git a/pandora_console/images/widgets/AgentHive.png b/pandora_console/images/widgets/AgentHive.png new file mode 100644 index 0000000000000000000000000000000000000000..9a3c4623e52c7a08eaa4d1018d84b79746e38124 GIT binary patch literal 5426 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 Date: Tue, 18 Jul 2023 01:01:01 +0200 Subject: [PATCH 9/9] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index c3721c3481..25cc4317bc 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.772-230717 +Version: 7.0NG.772-230718 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index b75cd1605d..841e77f29d 100644 --- 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.772-230717" +pandora_version="7.0NG.772-230718" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 7d08a232b1..2d7565e722 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1031,7 +1031,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.772'; -use constant AGENT_BUILD => '230717'; +use constant AGENT_BUILD => '230718'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index c61554dc4a..7adf1af667 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.772 -%define release 230717 +%define release 230718 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index ee587b10f7..2fb3a3c47f 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.772 -%define release 230717 +%define release 230718 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index d0452d5783..476bcfff87 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.772" -PI_BUILD="230717" +PI_BUILD="230718" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 7095ffc51e..25d53728df 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{230717} +{230718} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 465a673721..37b5d7b223 100644 --- 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.772 Build 230717") +#define PANDORA_VERSION ("7.0NG.772 Build 230718") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index b2cfbcf5a9..f0fb52d90c 100644 --- 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.772(Build 230717))" + VALUE "ProductVersion", "(7.0NG.772(Build 230718))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index db0060aaaa..93e195b067 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.772-230717 +Version: 7.0NG.772-230718 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index e83c4c4694..1dec27507e 100644 --- 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.772-230717" +pandora_version="7.0NG.772-230718" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index e63c15a5e5..b384fdf8d2 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC230717'; +$build_version = 'PC230718'; $pandora_version = 'v7.0NG.772'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index a816e04f11..2a21ae2c9c 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -131,7 +131,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 3232fd8164..4b20e76d49 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.772 -%define release 230717 +%define release 230718 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index ef9a34adea..77d690bdfc 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.772 -%define release 230717 +%define release 230718 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 8fb43e076a..856ee2d2ce 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.772" -PI_BUILD="230717" +PI_BUILD="230718" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 2279752285..841b212aa5 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.772 Build 230717"; +my $version = "7.0NG.772 Build 230718"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 5387e4d150..ac754cac92 100755 --- 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.772 Build 230717"; +my $version = "7.0NG.772 Build 230718"; # save program name for logging my $progname = basename($0);