diff --git a/agent/windows-setup-agent/SetupWizard.Designer.cs b/agent/windows-setup-agent/SetupWizard.Designer.cs index 36d18a8d7..83095c05e 100644 --- a/agent/windows-setup-agent/SetupWizard.Designer.cs +++ b/agent/windows-setup-agent/SetupWizard.Designer.cs @@ -38,6 +38,8 @@ this.lblConfigStatus = new System.Windows.Forms.Label(); this.prgConfig = new System.Windows.Forms.ProgressBar(); this.tabParameters = new System.Windows.Forms.TabPage(); + this.txtParentZone = new System.Windows.Forms.TextBox(); + this.lblParentZone = new System.Windows.Forms.Label(); this.linkLabelDocs = new System.Windows.Forms.LinkLabel(); this.groupBox4 = new System.Windows.Forms.GroupBox(); this.btnEditGlobalZone = new System.Windows.Forms.Button(); @@ -141,7 +143,7 @@ this.tabFinish.Location = new System.Drawing.Point(4, 5); this.tabFinish.Name = "tabFinish"; this.tabFinish.Padding = new System.Windows.Forms.Padding(3); - this.tabFinish.Size = new System.Drawing.Size(617, 495); + this.tabFinish.Size = new System.Drawing.Size(617, 472); this.tabFinish.TabIndex = 5; this.tabFinish.Text = "Finish"; this.tabFinish.UseVisualStyleBackColor = true; @@ -162,7 +164,7 @@ this.tabConfigure.Location = new System.Drawing.Point(4, 5); this.tabConfigure.Name = "tabConfigure"; this.tabConfigure.Padding = new System.Windows.Forms.Padding(3); - this.tabConfigure.Size = new System.Drawing.Size(617, 495); + this.tabConfigure.Size = new System.Drawing.Size(617, 472); this.tabConfigure.TabIndex = 4; this.tabConfigure.Text = "Configure Icinga 2"; this.tabConfigure.UseVisualStyleBackColor = true; @@ -185,6 +187,8 @@ // // tabParameters // + this.tabParameters.Controls.Add(this.txtParentZone); + this.tabParameters.Controls.Add(this.lblParentZone); this.tabParameters.Controls.Add(this.linkLabelDocs); this.tabParameters.Controls.Add(this.groupBox4); this.tabParameters.Controls.Add(this.introduction1); @@ -203,6 +207,23 @@ this.tabParameters.Text = "Agent Parameters"; this.tabParameters.UseVisualStyleBackColor = true; // + // txtParentZone + // + this.txtParentZone.Location = new System.Drawing.Point(528, 56); + this.txtParentZone.Name = "txtParentZone"; + this.txtParentZone.Size = new System.Drawing.Size(73, 20); + this.txtParentZone.TabIndex = 12; + this.txtParentZone.Text = "master"; + // + // lblParentZone + // + this.lblParentZone.AutoSize = true; + this.lblParentZone.Location = new System.Drawing.Point(525, 30); + this.lblParentZone.Name = "lblParentZone"; + this.lblParentZone.Size = new System.Drawing.Size(69, 13); + this.lblParentZone.TabIndex = 11; + this.lblParentZone.Text = "Parent Zone:"; + // // linkLabelDocs // this.linkLabelDocs.AutoSize = true; @@ -544,7 +565,7 @@ this.tabRetrieveCertificate.Location = new System.Drawing.Point(4, 5); this.tabRetrieveCertificate.Name = "tabRetrieveCertificate"; this.tabRetrieveCertificate.Padding = new System.Windows.Forms.Padding(3); - this.tabRetrieveCertificate.Size = new System.Drawing.Size(617, 495); + this.tabRetrieveCertificate.Size = new System.Drawing.Size(617, 472); this.tabRetrieveCertificate.TabIndex = 7; this.tabRetrieveCertificate.Text = "Checking Certificate"; this.tabRetrieveCertificate.UseVisualStyleBackColor = true; @@ -576,7 +597,7 @@ this.tabVerifyCertificate.Location = new System.Drawing.Point(4, 5); this.tabVerifyCertificate.Name = "tabVerifyCertificate"; this.tabVerifyCertificate.Padding = new System.Windows.Forms.Padding(3); - this.tabVerifyCertificate.Size = new System.Drawing.Size(617, 495); + this.tabVerifyCertificate.Size = new System.Drawing.Size(617, 472); this.tabVerifyCertificate.TabIndex = 6; this.tabVerifyCertificate.Text = "Verify Certificate"; this.tabVerifyCertificate.UseVisualStyleBackColor = true; @@ -677,7 +698,7 @@ this.tabError.Location = new System.Drawing.Point(4, 5); this.tabError.Name = "tabError"; this.tabError.Padding = new System.Windows.Forms.Padding(3); - this.tabError.Size = new System.Drawing.Size(617, 495); + this.tabError.Size = new System.Drawing.Size(617, 472); this.tabError.TabIndex = 8; this.tabError.Text = "Error"; this.tabError.UseVisualStyleBackColor = true; @@ -816,6 +837,8 @@ private System.Windows.Forms.ColumnHeader colGlobalZoneName; private System.Windows.Forms.CheckBox chkDisableConf; private System.Windows.Forms.LinkLabel linkLabelDocs; - } + private System.Windows.Forms.TextBox txtParentZone; + private System.Windows.Forms.Label lblParentZone; + } } diff --git a/agent/windows-setup-agent/SetupWizard.cs b/agent/windows-setup-agent/SetupWizard.cs index 327611c4b..8dcb370ac 100644 --- a/agent/windows-setup-agent/SetupWizard.cs +++ b/agent/windows-setup-agent/SetupWizard.cs @@ -219,6 +219,7 @@ namespace Icinga args += " --trustedcert \"" + _TrustedFile + "\""; args += " --cn \"" + txtInstanceName.Text.Trim() + "\""; args += " --zone \"" + txtInstanceName.Text.Trim() + "\""; + args += " --parent_zone \"" + txtParentZone.Text.Trim() + "\""; foreach (ListViewItem lvi in lvwGlobalZones.Items) { args += " --global_zones " + lvi.SubItems[0].Text.Trim(); @@ -318,6 +319,12 @@ namespace Icinga return; } + if (txtParentZone.Text.Length == 0) + { + Warning("Please specify the parent zone."); + return; + } + if (lvwEndpoints.Items.Count == 0) { Warning("You need to add at least one master/satellite endpoint."); return; diff --git a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_01.png b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_01.png index 1b7a1f117..15a4286e3 100644 Binary files a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_01.png and b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_01.png differ diff --git a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_02.png b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_02.png index 73f555963..26ab336e3 100644 Binary files a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_02.png and b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_02.png differ diff --git a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_02_global_zone.png b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_02_global_zone.png index 1b4ad2771..6e0fc366d 100644 Binary files a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_02_global_zone.png and b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_02_global_zone.png differ diff --git a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_03.png b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_03.png index ab0713458..0f5078829 100644 Binary files a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_03.png and b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_03.png differ