From 6995e680b50ee947a7a698e03c82f0e31c17ddec Mon Sep 17 00:00:00 2001
From: dirkwall <dirk.wallerstorfer@ruxit.com>
Date: Mon, 17 Oct 2016 13:20:12 +0200
Subject: [PATCH] - updating fuel-plugin UI for Dynatrace Managed instance

---
 components.yaml         |  3 ++-
 deployment_tasks.yaml   |  2 +-
 environment_config.yaml | 20 ++++++++++++++++++++
 metadata.yaml           |  4 ++--
 node_roles.yaml         |  4 ++--
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/components.yaml b/components.yaml
index 78a753d..2cc8a72 100644
--- a/components.yaml
+++ b/components.yaml
@@ -6,4 +6,5 @@
 
 - name: additional_service:fuel-plugin-dynatrace
   label: "Install Dynatrace Agent"
-  description: "Installs the Dynatrace Agent on all hosts"
+  description: "Installs the Dynatrace OneAgent on controller nodes and
+  Dynatrace Security Gateway on the Fuel master node"
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index 08c0c96..8b09ea9 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -2,8 +2,8 @@
 # can specify new tasks for any roles, even built-in ones.
 
 - id: fuel-plugin-dynatrace
+  role: ['controller']
   type: puppet
-  role: '*'
   requires: [post_deployment_start]
   required_for: [post_deployment_end]
   parameters:
diff --git a/environment_config.yaml b/environment_config.yaml
index 4f8034a..1036470 100644
--- a/environment_config.yaml
+++ b/environment_config.yaml
@@ -1,6 +1,7 @@
 attributes:
   metadata:
     group: 'other'
+  # Dynatrace environment ID
   dynatrace_tenant:
     type: "text"
     weight: 20
@@ -10,6 +11,7 @@ attributes:
     regex:
       source: '\S'
       error: "Environment ID must not be empty"
+  # Dynatrace environment token
   dynatrace_token:
     type: "text"
     weight: 30
@@ -19,3 +21,21 @@ attributes:
     regex:
       source: '\S'
       error: "Token must not be empty"
+  # Dynatrace Managed?
+  dynatrace_managed:
+    type: "checkbox"
+    weight: 40
+    value: false
+    label: "Do you use Dynatrace Managed?"
+    description: "Tick the checkbox if you are using Dynatrace Managed"
+  # Dynatrace Managed Server URL
+  dynatrace_managed_server:
+    type: "text"
+    weight: 40
+    value: ""
+    label: "Dynatrace server URL"
+    description: "Only needed if you have Dynatrace managed - use the URL
+    provided in the OneAgent installation screen (link)"
+    restrictions:
+      - condition: "settings:fuel-plugin-dynatrace.metadata.dynatrace_managed
+       != true"
\ No newline at end of file
diff --git a/metadata.yaml b/metadata.yaml
index c89534d..21cda9b 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -5,7 +5,7 @@ title: Dynatrace
 # Plugin version
 version: '1.0.0'
 # Description
-description: Installs the Dynatrace agent on hosts
+description: Installs the Dynatrace agent on controller nodes and Dynatrace security gateway on fuel master node
 # Required fuel version
 fuel_version: ['9.0']
 # Specify license of your plugin
@@ -13,7 +13,7 @@ licenses: ['Apache License Version 2.0']
 # Specify author or company name
 authors: ['Dirk Wallerstorfer (dirk.wallerstorfer@dynatrace.com), Dynatrace']
 # A link to the plugin's page
-homepage: 'https://github.com/openstack/fuel-plugins'
+homepage: 'https://github.com/Dynatrace/fuel-plugin-dynatrace'
 # Specify a group which your plugin implements, possible options:
 # network, storage, storage::cinder, storage::glance, hypervisor,
 # equipment
diff --git a/node_roles.yaml b/node_roles.yaml
index 7a0c5b6..b397227 100644
--- a/node_roles.yaml
+++ b/node_roles.yaml
@@ -1,8 +1,8 @@
 dynatrace:
   # Role name
-  name: "Dynatrace"
+  name: "Dynatrace OneAgent"
   # Role description
-  description: "Installs the Dynatrace Agent"
+  description: "Installs the Dynatrace OneAgent"
   # If primary then during orchestration this role will be
   # separated into primary-role and role
   has_primary: false