expand ADM job details; configure-application-dependency-mapping

docs/apps/application-components/_category_.yml

@@ -1,4 +1,4 @@
-position: 4
+position: 2
 label: 'Application Components'
 collapsible: true
 collapsed: true

docs/apps/application-components/application-component-templates.mdx

@@ -6,61 +6,59 @@ sidebar_position: 1
 import ThemedImage from '@theme/ThemedImage'
 import useBaseUrl from '@docusaurus/useBaseUrl'
 
-## Introduction
 
-You can use Application Component Templates to create and define your own Application Components based on services discovered by [Hypervisor/\*nix/Windows](/auto-discovery/windows-and-hyper-v-auto-discovery) autodiscovery jobs run against *nix and Windows platforms. 
+Configure a new Application Component Template to guide Device42 in creating [Application Components](/apps/application-components/index.mdx) that weren't created during your initial [Windows and *nix discovery job](/auto-discovery/windows-and-hyper-v-auto-discovery) runs.
 
-Device42 adds the Application Components you create using templates to the [Application Components](/apps/application-components) list page.
+Device42 automatically creates components for a [set list of applications](/apps/enterprise-application-dependency-mapping/adm-supported-applications.mdx). Other applications, such as in-house applications, won't have components automatically created for them, so you need to create component templates for them.
 
-:::info
-Application Components now automatically [suggest Application Groups](/apps/application-groups#application-group-list-page) that you can accept or ignore under **Applications > Application Groups > Application Group Suggestions** on the Main Appliance. 
-:::
+Device42 matches services it finds during discovery to the template criteria you define. When a service meets your template criteria, Device42 creates an Application Component for it.
 
-## View Application Component Templates
+Device42 adds the Application Components to the [Application Components](/apps/application-components) list page under **Applications > Application Components**. Device42 records show the detected application under the **Application** tab.
 
-Select **Applications > Application Component Templates** from the Device42 menu to display the templates list.
+## Example Application Components Templates
 
-<ThemedImage
-  alt="App Comp Templates menu"
-  sources={{
-    light: useBaseUrl('/assets/images/application-component-templates/menu-light.png'),
-    dark: useBaseUrl('/assets/images/application-component-templates/menu-dark.png'),
-  }}
-/>
+Java is a very common service you may find throughout your environment, but not all instances of it are relevant to your application. You can tune which of the Java service instances you create Application
+Components from.
 
-On the Application Component Templates list page, you can **Search by template name**, or filter the list by **Application Category**, **Enabled**, **Platform**, **Associated Service**, or by any of the options under **More Filters**.
+Define the listening port for the Java service, the Command Argument, or other services that must be present on the device for Device42 to create an Application Component.
+
+In the example below, a Java [Service Instance](/apps/services/service-instances.mdx) listening on port `8181`, found during discovery, is named “Jupiter”. The "Jupiter" application will be linked under the **Application** tab of the device record.
 
 <ThemedImage
-  alt="More filters"
+  alt="Jupiter Template example"
   sources={{
-    light: useBaseUrl('/assets/images/application-component-templates/more-filters-light.png'),
-    dark: useBaseUrl('/assets/images/application-component-templates/more-filters-dark.png'),
+    light: useBaseUrl('/assets/images/application-component-templates/jupiter-example-light.png'),
+    dark: useBaseUrl('/assets/images/application-component-templates/jupiter-example-dark.png'),
   }}
 />
 
-The Application Component Templates list page also includes an **Advanced Search** option you can use to construct more specific searches. See the [Advanced Search Feature](/getstarted/advanced-search-feature.mdx) page for instructions.
+The example below uses more complex application instance criteria:
 
-<ThemedImage
-  alt="Advanced Search"
-  sources={{
-    light: useBaseUrl('/assets/images/application-component-templates/advanced-search-query-light.png'),
-    dark: useBaseUrl('/assets/images/application-component-templates/advanced-search-query-dark.png'),
-  }}
-/>
+- The **Associate Service** is `OracleWebAssistant0`:
 
-Click on a template name to see more details about that template. Click **Edit** in the upper right corner of the details page to change or update an existing template.
+  <ThemedImage
+    alt="WebLogic Template example"
+    sources={{
+      light: useBaseUrl('/assets/images/application-component-templates/weblogic-example-light.png'),
+      dark: useBaseUrl('/assets/images/application-component-templates/weblogic-example-dark.png'),
+    }}
+  />
 
-<ThemedImage
-  alt="Info view of an Application Component Template"
-  sources={{
-    light: useBaseUrl('/assets/images/application-component-templates/template-info-light.png'),
-    dark: useBaseUrl('/assets/images/application-component-templates/template-info-dark.png'),
-  }}
-/>
+- The **Related Software Component** is `IBM WebSphere Application Server V9.0`:
+
+  <ThemedImage
+    alt="WebLogic Template example"
+    sources={{
+      light: useBaseUrl('/assets/images/application-component-templates/weblogic-example-related-software-components-light.png'),
+      dark: useBaseUrl('/assets/images/application-component-templates/weblogic-example-related-software-components-dark.png'),
+    }}
+  />
+
+An `OracleWebAssitant0` Service instance found during discovery is named “WebLogic” and found under the **Application** tab of the device record.
 
 ## Add an Application Component Template
 
-You can add a new template by clicking **Create** in the top right of the template list page.
+Add a new template by clicking **Create** in the top right of the template list page.
 
 <ThemedImage
   alt="Create an Application Component Template"
@@ -70,7 +68,13 @@ You can add a new template by clicking **Create** in the top right of the temp
   }}
 />
 
-### Application Component Template Configuration
+Although Application Component Templates grant you extensive granular control to avoid false positives, you only need to enter the following fields on the Template form to start creating Application Components:
+
+- The **Name**
+- The **System Type** (**Windows** or ***Nix**) 
+- The **Associated Service**
+
+Entering minimal details like this works great if you have a clearly defined service name.
 
 <ThemedImage
   alt="Docusaurus themed image"
@@ -81,12 +85,9 @@ You can add a new template by clicking **Create** in the top right of the temp
 />
 
 - Enter a **Name** for the template (required).
-- Select whether the template should be **Enabled** for use in autodiscovery jobs. This option lets you enable or disable the template according to when you need it without having to delete it when it's not in use.
-
-### Characteristics
-
-- Select the **Service Type** (Windows or \*Nix) to specify which platform Device42 autodiscovery searches for the service(s) that the Application Component will be based on.(required).
-- Select, enter, or add (using the **plus sign** icon) the **Associated Service** that autodiscovery will search for and use to create the Application Component (required).
+- Select whether the template should be **Enabled** for use in autodiscovery jobs. This option lets you enable or disable the template according to when you need it, without having to delete it when it's not in use.
+- Select the **Service Type** (Windows or \*Nix) to specify which platform Device42 autodiscovery searches for the service(s) that the Application Component is based on (required).
+- Select, enter, or add (using the **plus sign** icon) the **Associated Service** that autodiscovery searches for and uses to create the Application Component (required).
 - Enter a port in the **Only services listening on this port** field to limit autodiscovery to only the services that are listening on your chosen port. Leave the field empty to ignore the port.
 - For **Match Type**, select **Text** or **Regular Expression** to specify how you want to filter services:
   - You can enter a **Text** string pattern that discovery will use to create more service-specific Application Components by only generating Application Components for services with Service Command Arguments that contain the string.
@@ -101,7 +102,7 @@ You can add a new template by clicking **Create** in the top right of the temp
 
     >Performs simple text contains match on command argument text
 
-  - Enter a **Regular Expression** for more control over how you want to filter services. 
+  - Enter a **Regular Expression** for more control over how you want to filter services.
 
     <ThemedImage
     alt="Docusaurus themed image"
@@ -122,7 +123,7 @@ You can add a new template by clicking **Create** in the top right of the temp
   }}
 />
 
-- Enter an **Application Name Pattern** to specify how the Application Component is named. You can use static text and the following variables to construct the Application Component name.
+- Enter an **Application Name Pattern** to specify how Device42 names the Application Component. You can use static text and the following variables to construct the Application Component name.
 
     >The pattern can contain the following variables:
     >- `%(device_name)s` (required)
@@ -142,7 +143,7 @@ You can add a new template by clicking **Create** in the top right of the temp
     %(regex_name)s, %(regex_name1)s, %(regex_name2)s, %(regex_name3)s
     ```   
 
-- Select, enter, or add (using the **plus sign** icon) any **Related Software Components** or **Related Services** that should be associated with the Application Component. For Related Services, you can specify **Only services listening on this port**.
+- Select, enter, or add (using the **plus sign** icon) any **Related Software Components** or **Related Services** that Device42 should associate with the Application Component. For Related Services, you can specify **Only services listening on this port**.
 - Enter a path in **Configuration File Location** to specify the directory that Device42 should search for configuration files.
 - Enter a name or partial name in the **Configuration Filename Filter** field to identify the configuration file(s).
 - Select **Traverse subdirectories** to have Device42 traverse the Configuration File Location directory.
@@ -174,7 +175,7 @@ Select the templates to which you want to add the Custom Field values, then sele
   }}
 />
 
-- If you don't have any Custom Fields defined, you'll be guided to the **Add Custom Field** page where you can add one or several Custom Fields.
+- If you don't have any Custom Fields defined, Device42 guides you to the **Add Custom Field** page where you can add one or several Custom Fields.
 
     <ThemedImage
     alt="Custom Field Value action"
@@ -184,7 +185,7 @@ Select the templates to which you want to add the Custom Field values, then sele
     }}
     />
 
-To create a new Custom Field, navigate to Tools > Custom Fields and click Create.
+To create a new Custom Field, navigate to **Tools > Custom Fields** and click **Create**.
 
     <ThemedImage
     alt="Custom Field menu location"
@@ -236,6 +237,48 @@ To create a new Custom Field, navigate to Tools > Custom Fields and click Create
     }}
     />
 
+## Search for Application Component Templates
+
+Select **Applications > Application Component Templates** from the Device42 menu to display the templates list.
+
+<ThemedImage
+  alt="App Comp Templates menu"
+  sources={{
+    light: useBaseUrl('/assets/images/application-component-templates/menu-light.png'),
+    dark: useBaseUrl('/assets/images/application-component-templates/menu-dark.png'),
+  }}
+/>
+
+On the Application Component Templates list page, you can **Search by template name**, or filter the list by **Application Category**, **Enabled**, **Platform**, **Associated Service**, or by any of the options under **More Filters**.
+
+<ThemedImage
+  alt="More filters"
+  sources={{
+    light: useBaseUrl('/assets/images/application-component-templates/more-filters-light.png'),
+    dark: useBaseUrl('/assets/images/application-component-templates/more-filters-dark.png'),
+  }}
+/>
+
+The Application Component Templates list page also includes an **Advanced Search** option you can use to construct more specific searches. See the [Advanced Search Feature](/getstarted/advanced-search-feature.mdx) page for instructions.
+
+<ThemedImage
+  alt="Advanced Search"
+  sources={{
+    light: useBaseUrl('/assets/images/application-component-templates/advanced-search-query-light.png'),
+    dark: useBaseUrl('/assets/images/application-component-templates/advanced-search-query-dark.png'),
+  }}
+/>
+
+Click on a template name to see more details about that template. Click **Edit** in the upper right corner of the details page to change or update an existing template.
+
+<ThemedImage
+  alt="Info view of an Application Component Template"
+  sources={{
+    light: useBaseUrl('/assets/images/application-component-templates/template-info-light.png'),
+    dark: useBaseUrl('/assets/images/application-component-templates/template-info-dark.png'),
+  }}
+/>
+
 ## Autodiscovery Options
 
 <ThemedImage
@@ -246,8 +289,8 @@ To create a new Custom Field, navigate to Tools > Custom Fields and click Create
   }}
 />
 
-The Windows/\*nix autodiscovery jobs you run will check to see which Application Component Templates are enabled and use them to create Application Components. When creating an autodiscovery job, the following necessary options are enabled by default in the **Software and Applications** tab:
+The Windows/\*nix autodiscovery jobs you run will check to see which Application Component Templates you have enabled and use them to create Application Components. When creating an autodiscovery job, the following necessary options are enabled by default in the **Software and Applications** tab:
 
 - **Discover Software**
 - **Discover Services**
-- **Discover Applications**
+- **Discover Applications**

docs/apps/application-components/index.mdx

@@ -5,7 +5,23 @@ title: "Application Components"
 import ThemedImage from '@theme/ThemedImage'
 import useBaseUrl from '@docusaurus/useBaseUrl'
 
-Application Components capture what people generally think of as "applications." An application could be a CEO Dashboard that requires a web server/farm, an app server, and a database server. An Application Component can be linked to just one service or be defined without any underlying service.
+[Application Dependency Mapping (ADM)](/apps/index.mdx) uses Application Components as building blocks of the bigger application relationship model. Application Components capture what people generally think of as "applications." An application could be a CEO Dashboard that requires a web server/farm, an app server, and a database server.
+
+## How Application Components are Created
+
+Device42 automatically creates Application Components during Windows and *Nix discovery job runs. 
+
+Go to **Applications > Application Components** to view the created components. 
+
+Application Components are created for [this predefined list of supported applications](/apps/enterprise-application-dependency-mapping/adm-supported-applications.mdx). The list includes databases, web servers, and application layers used in application design. 
+
+If the services you use in your application are not on the [list](/apps/enterprise-application-dependency-mapping/adm-supported-applications.mdx), create an Application Component Template that guides Device42 in creating an Application Component for it. See the [Application Component Templates](application-component-templates.mdx) for details on creating a new template.
+
+
+
+## Services and Application Components
+
+An Application Component can be linked to just one service or be defined without any underlying service.
 
 ### Defining Application Components Based on Services
 
@@ -113,6 +129,3 @@ Let's create a new Application Component with dependencies. All of the dependenc
     }}
   />
 
-:::tip
-Set up Application Groups by defining a Starting Point or accepting suggestions. See the [Application Groups Calculation Rules](/apps/application-groups/calculation-rules) page for more details.
-:::

docs/apps/enterprise-application-dependency-mapping/adm-supported-applications.mdx

@@ -1,19 +1,11 @@
 ---
 title: "ADM Detected Applications"
-sidebar_position: 1
+sidebar_position: 3
 ---
 
-:::info
-Set up Application Groups by defining a Starting Point or processing one of our predefined Calculation Rules. See the [Application Groups Calculation Rules](/apps/application-groups/calculation-rules) page for more details.
-:::
-
-### Currently Supported Applications
-
 Enterprise Application Dependency Mapping discovers all running services, whether or not they are on this list.
 
-You can also use Enterprise Dependency Mapping to create [Application Components](/apps/application-components) for the following list of applications.
-
-Additionally, you can supplement the Device42 discovery processes by using [Application Component Templates](apps/application-components/application-component-templates.mdx) to automate Application Component creation (with custom logic) for any applications not on this list.
+You can supplement the Device42 discovery processes by using [Application Component Templates](apps/application-components/application-component-templates.mdx) to automate Application Component creation (with custom logic) for any applications not on this list.
 
 | Application | Services Discovered | Configuration Information Imported |
 | --- | --- | --- |
@@ -31,6 +23,6 @@ Additionally, you can supplement the Device42 discovery processes by using [Appl
 | Oracle Database | Yes | Instances, protocols, data paths |
 | PostgreSQL Database | Yes | Config file paths, protocols, data paths |
 | SAP Hana | Yes | Version, HDB Info, config files, ini files |
-| Sybase | Yes | Instances, data path, config path, config files, base path, data sserver |
+| Sybase | Yes | Instances, data path, config path, config files, base path, data server |
 | Tomcat | Yes | Config files, version, home path, JVM, architecture |
 | WebSphere | Yes | Version, config files, DTD path, product, path, servers |