From 02988d1fbfcc5324ceac484790dd0bbe7c74bfe5 Mon Sep 17 00:00:00 2001 From: Bengang Yuan Date: Thu, 12 Oct 2023 22:24:35 +0800 Subject: [PATCH] For pool, add a CheckBox for decide if to sync the NRPE configuration to all hosts. --- XenAdmin/Properties/AssemblyInfo.cs | 6 +- .../SettingsPanels/NRPEEditPage.Designer.cs | 90 +++---- XenAdmin/SettingsPanels/NRPEEditPage.cs | 219 ++++++++++-------- XenAdmin/SettingsPanels/NRPEEditPage.resx | 163 +++++++------ XenAdmin/XenAdmin.csproj | 4 +- 5 files changed, 265 insertions(+), 217 deletions(-) diff --git a/XenAdmin/Properties/AssemblyInfo.cs b/XenAdmin/Properties/AssemblyInfo.cs index 0b3ce02183..1e24ef8a49 100644 --- a/XenAdmin/Properties/AssemblyInfo.cs +++ b/XenAdmin/Properties/AssemblyInfo.cs @@ -35,10 +35,10 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("[XenCenter]")] -[assembly: AssemblyDescription("[XenCenter]")] +[assembly: AssemblyTitle("XenCenter")] +[assembly: AssemblyDescription("XenCenter")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyProduct("[XenCenter]")] +[assembly: AssemblyProduct("XenCenter")] // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from diff --git a/XenAdmin/SettingsPanels/NRPEEditPage.Designer.cs b/XenAdmin/SettingsPanels/NRPEEditPage.Designer.cs index a3fcc3103b..6c41c02557 100644 --- a/XenAdmin/SettingsPanels/NRPEEditPage.Designer.cs +++ b/XenAdmin/SettingsPanels/NRPEEditPage.Designer.cs @@ -30,8 +30,7 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NRPEEditPage)); this.NRPETableLayoutPanel = new System.Windows.Forms.TableLayoutPanel(); - this.DescLabelPool = new XenAdmin.Controls.Common.AutoHeightLabel(); - this.DescLabelHost = new XenAdmin.Controls.Common.AutoHeightLabel(); + this.BatchConfigurationCheckBox = new System.Windows.Forms.CheckBox(); this.EnableNRPECheckBox = new System.Windows.Forms.CheckBox(); this.GeneralConfigureGroupBox = new System.Windows.Forms.GroupBox(); this.GeneralConfigTableLayoutPanel = new System.Windows.Forms.TableLayoutPanel(); @@ -39,19 +38,21 @@ private void InitializeComponent() this.AllowHostsTextBox = new System.Windows.Forms.TextBox(); this.DebugLogCheckBox = new System.Windows.Forms.CheckBox(); this.SslDebugLogCheckBox = new System.Windows.Forms.CheckBox(); + this.RetrieveNRPEPanel = new System.Windows.Forms.TableLayoutPanel(); + this.RetrieveNRPELabel = new System.Windows.Forms.Label(); + this.RetrieveNRPEPicture = new System.Windows.Forms.PictureBox(); + this.DescLabelPool = new XenAdmin.Controls.Common.AutoHeightLabel(); + this.DescLabelHost = new XenAdmin.Controls.Common.AutoHeightLabel(); this.CheckDataGridView = new XenAdmin.Controls.DataGridViewEx.DataGridViewEx(); this.CheckColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.WarningThresholdColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.CriticalThresholdColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.RetrieveNRPEPanel = new System.Windows.Forms.TableLayoutPanel(); - this.RetrieveNRPELabel = new System.Windows.Forms.Label(); - this.RetrieveNRPEPicture = new System.Windows.Forms.PictureBox(); this.NRPETableLayoutPanel.SuspendLayout(); this.GeneralConfigureGroupBox.SuspendLayout(); this.GeneralConfigTableLayoutPanel.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.CheckDataGridView)).BeginInit(); this.RetrieveNRPEPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.RetrieveNRPEPicture)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.CheckDataGridView)).BeginInit(); this.SuspendLayout(); // // NRPETableLayoutPanel @@ -59,21 +60,19 @@ private void InitializeComponent() resources.ApplyResources(this.NRPETableLayoutPanel, "NRPETableLayoutPanel"); this.NRPETableLayoutPanel.Controls.Add(this.DescLabelPool, 0, 0); this.NRPETableLayoutPanel.Controls.Add(this.DescLabelHost, 0, 1); - this.NRPETableLayoutPanel.Controls.Add(this.EnableNRPECheckBox, 0, 2); - this.NRPETableLayoutPanel.Controls.Add(this.GeneralConfigureGroupBox, 0, 3); - this.NRPETableLayoutPanel.Controls.Add(this.CheckDataGridView, 0, 4); - this.NRPETableLayoutPanel.Controls.Add(this.RetrieveNRPEPanel, 0, 5); + this.NRPETableLayoutPanel.Controls.Add(this.BatchConfigurationCheckBox, 0, 2); + this.NRPETableLayoutPanel.Controls.Add(this.EnableNRPECheckBox, 0, 3); + this.NRPETableLayoutPanel.Controls.Add(this.GeneralConfigureGroupBox, 0, 4); + this.NRPETableLayoutPanel.Controls.Add(this.CheckDataGridView, 0, 5); + this.NRPETableLayoutPanel.Controls.Add(this.RetrieveNRPEPanel, 0, 6); this.NRPETableLayoutPanel.Name = "NRPETableLayoutPanel"; // - // DescLabelPool - // - resources.ApplyResources(this.DescLabelPool, "DescLabelPool"); - this.DescLabelPool.Name = "DescLabelPool"; - // - // DescLabelHost + // BatchConfigurationCheckBox // - resources.ApplyResources(this.DescLabelHost, "DescLabelHost"); - this.DescLabelHost.Name = "DescLabelHost"; + resources.ApplyResources(this.BatchConfigurationCheckBox, "BatchConfigurationCheckBox"); + this.BatchConfigurationCheckBox.Name = "BatchConfigurationCheckBox"; + this.BatchConfigurationCheckBox.UseVisualStyleBackColor = true; + this.BatchConfigurationCheckBox.CheckedChanged += new System.EventHandler(this.BatchConfigurationCheckBox_CheckedChanged); // // EnableNRPECheckBox // @@ -122,6 +121,34 @@ private void InitializeComponent() this.SslDebugLogCheckBox.Name = "SslDebugLogCheckBox"; this.SslDebugLogCheckBox.UseVisualStyleBackColor = true; // + // RetrieveNRPEPanel + // + resources.ApplyResources(this.RetrieveNRPEPanel, "RetrieveNRPEPanel"); + this.RetrieveNRPEPanel.Controls.Add(this.RetrieveNRPELabel, 1, 0); + this.RetrieveNRPEPanel.Controls.Add(this.RetrieveNRPEPicture, 0, 0); + this.RetrieveNRPEPanel.Name = "RetrieveNRPEPanel"; + // + // RetrieveNRPELabel + // + resources.ApplyResources(this.RetrieveNRPELabel, "RetrieveNRPELabel"); + this.RetrieveNRPELabel.Name = "RetrieveNRPELabel"; + // + // RetrieveNRPEPicture + // + resources.ApplyResources(this.RetrieveNRPEPicture, "RetrieveNRPEPicture"); + this.RetrieveNRPEPicture.Name = "RetrieveNRPEPicture"; + this.RetrieveNRPEPicture.TabStop = false; + // + // DescLabelPool + // + resources.ApplyResources(this.DescLabelPool, "DescLabelPool"); + this.DescLabelPool.Name = "DescLabelPool"; + // + // DescLabelHost + // + resources.ApplyResources(this.DescLabelHost, "DescLabelHost"); + this.DescLabelHost.Name = "DescLabelHost"; + // // CheckDataGridView // this.CheckDataGridView.BackgroundColor = System.Drawing.SystemColors.Window; @@ -141,41 +168,23 @@ private void InitializeComponent() // // CheckColumn // - this.CheckColumn.FillWeight = 40F; + this.CheckColumn.FillWeight = 15.57632F; resources.ApplyResources(this.CheckColumn, "CheckColumn"); this.CheckColumn.Name = "CheckColumn"; this.CheckColumn.ReadOnly = true; // // WarningThresholdColumn // - this.WarningThresholdColumn.FillWeight = 30F; + this.WarningThresholdColumn.FillWeight = 42.21184F; resources.ApplyResources(this.WarningThresholdColumn, "WarningThresholdColumn"); this.WarningThresholdColumn.Name = "WarningThresholdColumn"; // // CriticalThresholdColumn // - this.CriticalThresholdColumn.FillWeight = 30F; + this.CriticalThresholdColumn.FillWeight = 42.21184F; resources.ApplyResources(this.CriticalThresholdColumn, "CriticalThresholdColumn"); this.CriticalThresholdColumn.Name = "CriticalThresholdColumn"; // - // RetrieveNRPEPanel - // - resources.ApplyResources(this.RetrieveNRPEPanel, "RetrieveNRPEPanel"); - this.RetrieveNRPEPanel.Controls.Add(this.RetrieveNRPELabel, 1, 0); - this.RetrieveNRPEPanel.Controls.Add(this.RetrieveNRPEPicture, 0, 0); - this.RetrieveNRPEPanel.Name = "RetrieveNRPEPanel"; - // - // RetrieveNRPELabel - // - resources.ApplyResources(this.RetrieveNRPELabel, "RetrieveNRPELabel"); - this.RetrieveNRPELabel.Name = "RetrieveNRPELabel"; - // - // RetrieveNRPEPicture - // - resources.ApplyResources(this.RetrieveNRPEPicture, "RetrieveNRPEPicture"); - this.RetrieveNRPEPicture.Name = "RetrieveNRPEPicture"; - this.RetrieveNRPEPicture.TabStop = false; - // // NRPEEditPage // resources.ApplyResources(this, "$this"); @@ -188,9 +197,9 @@ private void InitializeComponent() this.GeneralConfigureGroupBox.PerformLayout(); this.GeneralConfigTableLayoutPanel.ResumeLayout(false); this.GeneralConfigTableLayoutPanel.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.CheckDataGridView)).EndInit(); this.RetrieveNRPEPanel.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.RetrieveNRPEPicture)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.CheckDataGridView)).EndInit(); this.ResumeLayout(false); } @@ -213,6 +222,7 @@ private void InitializeComponent() private System.Windows.Forms.Label RetrieveNRPELabel; private System.Windows.Forms.TableLayoutPanel RetrieveNRPEPanel; private System.Windows.Forms.PictureBox RetrieveNRPEPicture; + private System.Windows.Forms.CheckBox BatchConfigurationCheckBox; } } \ No newline at end of file diff --git a/XenAdmin/SettingsPanels/NRPEEditPage.cs b/XenAdmin/SettingsPanels/NRPEEditPage.cs index 8193664289..191ab0f6fa 100644 --- a/XenAdmin/SettingsPanels/NRPEEditPage.cs +++ b/XenAdmin/SettingsPanels/NRPEEditPage.cs @@ -96,6 +96,7 @@ public NRPEEditPage() _checkGroupDictByLabel.Add(checkGroup.NameCell.Value.ToString(), checkGroup); } + AllowHostsTextBox.Text = NRPEHostConfiguration.ALLOW_HOSTS_PLACE_HOLDER; AllowHostsTextBox.ForeColor = Color.FromKnownColor(KnownColor.ControlDark); AllowHostsTextBox.GotFocus += AllowHostsTextBox_GotFocus; AllowHostsTextBox.LostFocus += AllowHostsTextBox_LostFocus; @@ -158,15 +159,13 @@ public bool HasChanged { get { - UpdateCurrentNRPEConfiguration(); - if (_isHost) - { - return IsNRPEConfigurationChanged(); - } - else + if (_isHost && IsNRPEConfigurationChanged() || + !_isHost && BatchConfigurationCheckBox.Checked) { + UpdateCurrentNRPEConfiguration(); return true; } + return false; } } @@ -235,6 +234,7 @@ public void SetXenObjects(IXenObject orig, IXenObject clone) DescLabelHost.Visible = _isHost; DescLabelPool.Visible = !_isHost; + BatchConfigurationCheckBox.Visible = !_isHost; UpdateRetrievingNRPETip(NRPEHostConfiguration.RetrieveNRPEStatus.Retrieving); DisableAllComponent(); @@ -252,10 +252,16 @@ private void UpdateRetrieveStatus() { if (_nrpeOriginalConfig.Status == NRPEHostConfiguration.RetrieveNRPEStatus.Successful) { - AllowHostsTextBox.ForeColor = AllowHostsTextBox.Text.Equals(NRPEHostConfiguration.ALLOW_HOSTS_PLACE_HOLDER) ? - Color.FromKnownColor(KnownColor.ControlDark) : Color.FromKnownColor(KnownColor.ControlText); - UpdateOtherComponentBasedEnableNRPECheckBox(); - UpdateComponentBasedConfiguration(); + if (_isHost) + { + EnableNRPECheckBox.Enabled = true; + UpdateComponentValueBasedConfiguration(); + UpdateComponentStatusBasedEnableNRPECheckBox(); + } + else + { + BatchConfigurationCheckBox.Enabled = true; + } } UpdateRetrievingNRPETip(_nrpeOriginalConfig.Status); } @@ -291,96 +297,40 @@ private void UpdateRetrievingNRPETip(NRPEHostConfiguration.RetrieveNRPEStatus st private void DisableAllComponent() { - EnableNRPECheckBox.Enabled = false; - GeneralConfigureGroupBox.Enabled = false; - CheckDataGridView.Enabled = false; - } - - private bool IsAllowHostsValid() - { - _invalidParamToolTip.ToolTipTitle = Messages.NRPE_ALLOW_HOSTS_ERROR_TITLE; - _invalidParamToolTip.Tag = AllowHostsTextBox; - CheckDataGridView.ShowCellToolTips = true; - - string str = AllowHostsTextBox.Text; - if (str.Trim().Length == 0 || str.Trim().Equals(NRPEHostConfiguration.ALLOW_HOSTS_PLACE_HOLDER)) - { - _invalidParamToolTipText = Messages.NRPE_ALLOW_HOSTS_EMPTY_ERROR; - return false; - } - - string[] hostArray = str.Split(','); - for ( int i = 0; i < hostArray.Length; i++ ) - { - if (!REGEX_IPV4.Match(hostArray[i].Trim()).Success && - !REGEX_IPV4_CIDR.Match(hostArray[i].Trim()).Success && - !REGEX_DOMAIN.Match(hostArray[i].Trim()).Success) - { - _invalidParamToolTipText = Messages.NRPE_ALLOW_HOSTS_FORMAT_ERROR; - return false; - } - for ( int j = 0; j < i; j++ ) - { - if (hostArray[i].Trim().Equals(hostArray[j].Trim())) - { - _invalidParamToolTipText = Messages.NRPE_ALLOW_HOSTS_SAME_ADDRESS; - return false; - } - } - } - foreach (string host in hostArray) - { - if (!REGEX_IPV4.Match(host.Trim()).Success && - !REGEX_IPV4_CIDR.Match(host.Trim()).Success && - !REGEX_DOMAIN.Match(host.Trim()).Success) - { - _invalidParamToolTipText = Messages.NRPE_ALLOW_HOSTS_FORMAT_ERROR; - return false; - } - } - CheckDataGridView.ShowCellToolTips = false; - return true; - } - - private string AllowHostsWithoutLocalAddress(string allowHosts) - { - string UpdatedAllowHosts = ""; - string[] AllowHostArray = allowHosts.Split(','); - foreach (string allowHost in AllowHostArray) - { - if (!allowHost.Trim().Equals("127.0.0.1") && - !allowHost.Trim().Equals("::1")) - { - UpdatedAllowHosts += allowHost + ","; - } - } - return UpdatedAllowHosts.Length == 0 ? NRPEHostConfiguration.ALLOW_HOSTS_PLACE_HOLDER : - UpdatedAllowHosts.Substring(0, UpdatedAllowHosts.Length - 1); - } - - private void UpdateOtherComponentBasedEnableNRPECheckBox() - { - GeneralConfigureGroupBox.Enabled = EnableNRPECheckBox.Checked; - UpdateCheckDataGridViewAvailableStatus(); - } - - private void UpdateComponentBasedConfiguration() - { - EnableNRPECheckBox.Enabled = true; - EnableNRPECheckBox.Checked = _nrpeOriginalConfig.EnableNRPE; - AllowHostsTextBox.Text = AllowHostsWithoutLocalAddress(_nrpeOriginalConfig.AllowHosts); - AllowHostsTextBox.ForeColor = AllowHostsTextBox.Text.Equals(NRPEHostConfiguration.ALLOW_HOSTS_PLACE_HOLDER) ? - Color.FromKnownColor(KnownColor.ControlDark) : AllowHostsTextBox.ForeColor = Color.FromKnownColor(KnownColor.ControlText); - DebugLogCheckBox.Checked = _nrpeOriginalConfig.Debug; - SslDebugLogCheckBox.Checked = _nrpeOriginalConfig.SslLogging; - UpdateCheckDataGridViewAvailableStatus(); - } - - private void UpdateCheckDataGridViewAvailableStatus() - { - CheckDataGridView.Enabled = EnableNRPECheckBox.Checked; - CheckDataGridView.DefaultCellStyle.BackColor = EnableNRPECheckBox.Checked ? - Color.FromKnownColor(KnownColor.Window) : Color.FromKnownColor(KnownColor.Control); + EnableNRPECheckBox.Enabled = false; + GeneralConfigureGroupBox.Enabled = false; + CheckDataGridView.Enabled = false; + } + + private void UpdateComponentValueBasedConfiguration() + { + EnableNRPECheckBox.Checked = _nrpeOriginalConfig.EnableNRPE; + AllowHostsTextBox.Text = AllowHostsWithoutLocalAddress(_nrpeOriginalConfig.AllowHosts); + AllowHostsTextBox.ForeColor = AllowHostsTextBox.Text.Equals(NRPEHostConfiguration.ALLOW_HOSTS_PLACE_HOLDER) ? + Color.FromKnownColor(KnownColor.ControlDark) : AllowHostsTextBox.ForeColor = Color.FromKnownColor(KnownColor.ControlText); + DebugLogCheckBox.Checked = _nrpeOriginalConfig.Debug; + SslDebugLogCheckBox.Checked = _nrpeOriginalConfig.SslLogging; + } + + private void UpdateComponentStatusBasedBatchConfigurationCheckBox() + { + if (BatchConfigurationCheckBox.Checked) + { + EnableNRPECheckBox.Enabled = true; + UpdateComponentStatusBasedEnableNRPECheckBox(); + } + else + { + DisableAllComponent(); + } + } + + private void UpdateComponentStatusBasedEnableNRPECheckBox() + { + GeneralConfigureGroupBox.Enabled = EnableNRPECheckBox.Checked; + CheckDataGridView.Enabled = EnableNRPECheckBox.Checked; + CheckDataGridView.DefaultCellStyle.BackColor = EnableNRPECheckBox.Checked ? + Color.FromKnownColor(KnownColor.Window) : Color.FromKnownColor(KnownColor.Control); if (_isHost) { foreach (var checkGroup in _checkGroupList) @@ -399,6 +349,68 @@ private void UpdateCheckDataGridViewAvailableStatus() } } + private bool IsAllowHostsValid() + { + _invalidParamToolTip.ToolTipTitle = Messages.NRPE_ALLOW_HOSTS_ERROR_TITLE; + _invalidParamToolTip.Tag = AllowHostsTextBox; + CheckDataGridView.ShowCellToolTips = true; + + string str = AllowHostsTextBox.Text; + if (str.Trim().Length == 0 || str.Trim().Equals(NRPEHostConfiguration.ALLOW_HOSTS_PLACE_HOLDER)) + { + _invalidParamToolTipText = Messages.NRPE_ALLOW_HOSTS_EMPTY_ERROR; + return false; + } + + string[] hostArray = str.Split(','); + for ( int i = 0; i < hostArray.Length; i++ ) + { + if (!REGEX_IPV4.Match(hostArray[i].Trim()).Success && + !REGEX_IPV4_CIDR.Match(hostArray[i].Trim()).Success && + !REGEX_DOMAIN.Match(hostArray[i].Trim()).Success) + { + _invalidParamToolTipText = Messages.NRPE_ALLOW_HOSTS_FORMAT_ERROR; + return false; + } + for ( int j = 0; j < i; j++ ) + { + if (hostArray[i].Trim().Equals(hostArray[j].Trim())) + { + _invalidParamToolTipText = Messages.NRPE_ALLOW_HOSTS_SAME_ADDRESS; + return false; + } + } + } + foreach (string host in hostArray) + { + if (!REGEX_IPV4.Match(host.Trim()).Success && + !REGEX_IPV4_CIDR.Match(host.Trim()).Success && + !REGEX_DOMAIN.Match(host.Trim()).Success) + { + _invalidParamToolTipText = Messages.NRPE_ALLOW_HOSTS_FORMAT_ERROR; + return false; + } + } + CheckDataGridView.ShowCellToolTips = false; + return true; + } + + private string AllowHostsWithoutLocalAddress(string allowHosts) + { + string UpdatedAllowHosts = ""; + string[] AllowHostArray = allowHosts.Split(','); + foreach (string allowHost in AllowHostArray) + { + if (!allowHost.Trim().Equals("127.0.0.1") && + !allowHost.Trim().Equals("::1")) + { + UpdatedAllowHosts += allowHost + ","; + } + } + return UpdatedAllowHosts.Length == 0 ? NRPEHostConfiguration.ALLOW_HOSTS_PLACE_HOLDER : + UpdatedAllowHosts.Substring(0, UpdatedAllowHosts.Length - 1); + } + private bool IsNRPEConfigurationChanged() { if (_nrpeCurrentConfig.EnableNRPE != _nrpeOriginalConfig.EnableNRPE || @@ -442,9 +454,14 @@ private void UpdateCurrentNRPEConfiguration() } } + private void BatchConfigurationCheckBox_CheckedChanged(object sender, EventArgs e) + { + UpdateComponentStatusBasedBatchConfigurationCheckBox(); + } + private void EnableNRPECheckBox_CheckedChanged(object sender, EventArgs e) { - UpdateOtherComponentBasedEnableNRPECheckBox(); + UpdateComponentStatusBasedEnableNRPECheckBox(); } private void AllowHostsTextBox_GotFocus(object sender, EventArgs e) diff --git a/XenAdmin/SettingsPanels/NRPEEditPage.resx b/XenAdmin/SettingsPanels/NRPEEditPage.resx index b8734a0554..bfbbd26f35 100644 --- a/XenAdmin/SettingsPanels/NRPEEditPage.resx +++ b/XenAdmin/SettingsPanels/NRPEEditPage.resx @@ -133,13 +133,13 @@ - 4, 0 + 3, 0 - 4, 0, 4, 15 + 3, 0, 3, 10 - 967, 39 + 644, 39 0 @@ -152,7 +152,7 @@ This page does not offer an overview of the NRPE configuration and metric thresh DescLabelPool - XenAdmin.Controls.Common.AutoHeightLabel, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Controls.Common.AutoHeightLabel, XenCenter, Version=0.0.0.9999, Culture=neutral, PublicKeyToken=null NRPETableLayoutPanel @@ -170,13 +170,13 @@ This page does not offer an overview of the NRPE configuration and metric thresh NoControl - 4, 54 + 3, 49 - 4, 0, 4, 15 + 3, 0, 3, 10 - 967, 26 + 644, 26 1 @@ -189,7 +189,7 @@ Use this page to review and modify the NRPE configuration and metric threshold s DescLabelHost - XenAdmin.Controls.Common.AutoHeightLabel, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Controls.Common.AutoHeightLabel, XenCenter, Version=0.0.0.9999, Culture=neutral, PublicKeyToken=null NRPETableLayoutPanel @@ -197,6 +197,42 @@ Use this page to review and modify the NRPE configuration and metric threshold s 1 + + True + + + NoControl + + + 3, 88 + + + 3, 3, 3, 8 + + + 3, 0, 0, 0 + + + 171, 17 + + + 7 + + + Sync &Configuration to all hosts + + + BatchConfigurationCheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NRPETableLayoutPanel + + + 2 + True @@ -204,16 +240,16 @@ Use this page to review and modify the NRPE configuration and metric threshold s NoControl - 4, 99 + 3, 116 - 4, 4, 4, 12 + 3, 3, 3, 8 - 4, 0, 0, 0 + 3, 0, 0, 0 - 103, 21 + 95, 17 2 @@ -231,7 +267,7 @@ Use this page to review and modify the NRPE configuration and metric threshold s NRPETableLayoutPanel - 2 + 3 True @@ -252,10 +288,7 @@ Use this page to review and modify the NRPE configuration and metric threshold s NoControl - 4, 7 - - - 4, 0, 4, 0 + 3, 6 96, 13 @@ -282,13 +315,10 @@ Use this page to review and modify the NRPE configuration and metric threshold s Left, Right - 108, 4 - - - 4, 4, 4, 4 + 105, 3 - 847, 20 + 530, 20 1 @@ -312,16 +342,13 @@ Use this page to review and modify the NRPE configuration and metric threshold s NoControl - 4, 32 - - - 4, 4, 4, 4 + 3, 29 - 4, 0, 0, 0 + 3, 0, 0, 0 - 219, 21 + 211, 17 2 @@ -348,16 +375,13 @@ Use this page to review and modify the NRPE configuration and metric threshold s NoControl - 4, 61 - - - 4, 4, 4, 4 + 3, 52 - 4, 0, 0, 0 + 3, 0, 0, 0 - 189, 21 + 181, 17 3 @@ -381,16 +405,13 @@ Use this page to review and modify the NRPE configuration and metric threshold s Top - 4, 17 - - - 4, 4, 4, 4 + 3, 16 3 - 959, 86 + 638, 72 0 @@ -408,22 +429,22 @@ Use this page to review and modify the NRPE configuration and metric threshold s 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="AllowHostsLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="AllowHostsTextBox" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="DebugLogCheckBox" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="SslDebugLogCheckBox" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,Absolute,30" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="AllowHostsLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="AllowHostsTextBox" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="DebugLogCheckBox" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="SslDebugLogCheckBox" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20" /></TableLayoutSettings> Fill - 4, 136 + 3, 144 - 4, 4, 4, 15 + 3, 3, 3, 10 - 4, 4, 4, 0 + 3, 3, 3, 0 - 967, 150 + 644, 100 3 @@ -441,7 +462,7 @@ Use this page to review and modify the NRPE configuration and metric threshold s NRPETableLayoutPanel - 3 + 4 34 @@ -474,16 +495,13 @@ Use this page to review and modify the NRPE configuration and metric threshold s Fill - 4, 305 - - - 4, 4, 4, 4 + 3, 257 62 - 967, 450 + 644, 248 4 @@ -492,13 +510,13 @@ Use this page to review and modify the NRPE configuration and metric threshold s CheckDataGridView - XenAdmin.Controls.DataGridViewEx.DataGridViewEx, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + XenAdmin.Controls.DataGridViewEx.DataGridViewEx, XenCenter, Version=0.0.0.9999, Culture=neutral, PublicKeyToken=null NRPETableLayoutPanel - 4 + 5 True @@ -513,13 +531,10 @@ Use this page to review and modify the NRPE configuration and metric threshold s NoControl - 35, 0 - - - 4, 0, 4, 0 + 24, 0 - 930, 31 + 619, 5 5 @@ -542,11 +557,17 @@ Use this page to review and modify the NRPE configuration and metric threshold s 0 + + NoControl + - 3, 3 + 2, 2 + + + 2, 2, 2, 2 - 25, 25 + 17, 1 6 @@ -564,13 +585,16 @@ Use this page to review and modify the NRPE configuration and metric threshold s 1 - 3, 762 + 2, 510 + + + 2, 2, 2, 2 1 - 969, 31 + 646, 5 6 @@ -585,7 +609,7 @@ Use this page to review and modify the NRPE configuration and metric threshold s NRPETableLayoutPanel - 5 + 6 <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="RetrieveNRPELabel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="RetrieveNRPEPicture" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="Percent,100" /></TableLayoutSettings> @@ -597,13 +621,13 @@ Use this page to review and modify the NRPE configuration and metric threshold s 0, 0 - 4, 15, 4, 0 + 3, 10, 3, 0 - 7 + 8 - 975, 806 + 650, 537 0 @@ -621,22 +645,19 @@ Use this page to review and modify the NRPE configuration and metric threshold s 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="DescLabelPool" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="DescLabelHost" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="EnableNRPECheckBox" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="GeneralConfigureGroupBox" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="CheckDataGridView" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="RetrieveNRPEPanel" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,Absolute,10" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="DescLabelPool" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="DescLabelHost" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="BatchConfigurationCheckBox" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="EnableNRPECheckBox" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="GeneralConfigureGroupBox" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="CheckDataGridView" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="RetrieveNRPEPanel" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,Absolute,20" /></TableLayoutSettings> True - 144, 144 + 96, 96 True - - 4, 4, 4, 4 - - 975, 806 + 650, 537 CheckColumn diff --git a/XenAdmin/XenAdmin.csproj b/XenAdmin/XenAdmin.csproj index 2c2420e005..c60abed56e 100755 --- a/XenAdmin/XenAdmin.csproj +++ b/XenAdmin/XenAdmin.csproj @@ -9,7 +9,7 @@ WinExe Properties XenAdmin - [XenCenter] + XenCenter ..\Branding\Images\AppIcon.ico v4.8 publish\ @@ -6816,4 +6816,4 @@ copy "$(ProjectDir)\ReportViewer\resource_report.rdlc" "$(TargetDir)" - \ No newline at end of file +