Add nginx relationship (#2502)

* Update windows service rule
* update summary metric

Author: abhishuraina

entity-types/infra-elasticsearchcluster/golden_metrics.stg.yml

@@ -83,6 +83,11 @@ clusterUnassignedShard:
       where: state='unassigned'
       eventId: entity.guid
       eventName: entity.name
+    newRelic:
+      select: average(shards.unassigned)
+      from: ElasticsearchClusterSample
+      eventId: entityGuid
+      eventName: entityName
 clusterPendingTask:
   title: Cluster Pending Task
   queries:

entity-types/infra-elasticsearchcluster/newrelic_dashboard.stg.json

@@ -21,15 +21,15 @@
             "nrqlQueries": [
               {
                 "accountId": 0,
-                "query": "FROM ElasticsearchClusterSample SELECT latest(cluster.status)"
+                "query": "FROM ElasticsearchClusterSample SELECT latest(cluster.status) as Status"
               }
             ]
           }
         },
         {
           "title": "Node count",
           "layout": {
-            "column": 9,
+            "column": 5,
             "row": 1,
             "width": 4,
             "height": 3
@@ -41,16 +41,16 @@
             "nrqlQueries": [
               {
                 "accountId": 0,
-                "query": "SELECT \n  latest(cluster.nodes) AS 'Total Nodes', \n  latest(cluster.dataNodes) AS 'Data Nodes' \nFROM ElasticsearchClusterSample"
+                "query": "SELECT \nlatest(cluster.nodes) AS 'Total Nodes', \nlatest(cluster.dataNodes) AS 'Data Nodes' \nFROM ElasticsearchClusterSample"
               }
             ]
           }
         },
         {
           "title": "Shards",
           "layout": {
-            "column": 1,
-            "row": 4,
+            "column": 9,
+            "row": 1,
             "width": 4,
             "height": 3
           },
@@ -61,7 +61,7 @@
             "nrqlQueries": [
               {
                 "accountId": 0,
-                "query": "FROM ElasticsearchClusterSample \n SELECT latest(shards.active) as 'Active Shards', latest(shards.initializing) as 'Initializing Shards', atest(shards.primaryActive) as 'Primary Active Shards, latest(shards.relocating) as 'Relocating Shards', latest(shards.unassigned) as 'Unassigned Shards', latest(shards.active + shards.initializing + shards.primaryActive + shards.relocating  + shards.unassigned ) as 'Total shards'"
+                "query": "FROM ElasticsearchClusterSample \nSELECT latest(shards.active) as 'Active Shards',\nlatest(shards.initializing) as 'Initializing Shards',\nlatest(shards.primaryActive) as 'Primary Active Shards',\nlatest(shards.relocating) as 'Relocating Shards',\nlatest(shards.unassigned) as 'Unassigned Shards',\nlatest(shards.active + shards.initializing + shards.primaryActive + shards.relocating  + shards.unassigned ) as 'Total shards'\nTIMESERIES"
               }
             ]
           }

relationships/synthesis/INFRA-HOST-to-INFRA-NGINXSERVER.stg.yml

@@ -67,3 +67,71 @@ relationships:
           attribute: entity.guid
           entityType:
             value: NGINXSERVER
+
+  - name: infrahostHostsNginxServer
+    version: "1"
+    origins:
+      - OnHost Integration
+    conditions: 
+      - attribute: eventType
+        anyOf: [ "NginxSample" ]
+      - attribute: nr.entityType
+        anyOf: ["NGINXServer","NGINXSERVER"]
+      - attribute: reportingAgent
+        present: true
+    relationship:
+      expires: PT75M
+      relationshipType: HOSTS
+      source:
+        buildGuid:
+          account:
+            attribute: accountId
+          domain:
+            value: INFRA
+          type:
+            value: HOST
+            valueInGuid: NA
+          identifier:
+            fragments:
+              - attribute: reportingAgent # cloudproviderID
+            hashAlgorithm: FARM_HASH
+      target:
+        extractGuid:
+          attribute: entityGuid
+          entityType:
+            value: NGINXServer
+
+  - name: infrahostHostsNginxServerrule2
+    version: "1"
+    origins:
+      - OnHost Integration
+    conditions: 
+      - attribute: eventType
+        anyOf: [ "NginxSample" ]
+      - attribute: nr.entityType
+        anyOf: ["NGINXServer","NGINXSERVER"]
+      - attribute: fullHostname
+        present: true
+      - attribute: reportingAgent
+        present: false
+    relationship:
+      expires: PT75M
+      relationshipType: HOSTS
+      source:
+        buildGuid:
+          account:
+            attribute: accountId
+          domain:
+            value: INFRA
+          type:
+            value: HOST
+            valueInGuid: NA
+          identifier:
+            fragments:
+              - attribute: fullHostname
+            hashAlgorithm: FARM_HASH
+      target:
+        extractGuid:
+          attribute: entityGuid
+          entityType:
+            value: NGINXServer

relationships/synthesis/INFRA-HOST-to-INFRA-WIN_SERVICE.stg.yml

@@ -6,57 +6,17 @@ relationships:
     conditions:
       - attribute: entity.type
         anyOf: ["WIN_SERVICE"]
-      - attribute: reportingAgent
+      - attribute: hostname
         present: true
     relationship:
       expires: PT75M
       relationshipType: HOSTS
       source:
-        buildGuid:
-          account:
-            attribute: accountId
-          domain:
-            value: INFRA
-          type:
-            value: HOST
-            valueInGuid: NA
-          identifier:
-            fragments:
-              - attribute: reportingAgent # cloudproviderID
-            hashAlgorithm: FARM_HASH
-      target:
-        extractGuid:
-          attribute: entity.guid
-          entityType:
-            value: WIN_SERVICE
-
-  - name: hostHostsWinserviceRule2
-    version: "1"
-    origins:
-      - OnHost Integration
-    conditions:
-      - attribute: entity.type
-        anyOf: ["WIN_SERVICE"]
-      - attribute: fullHostname
-        present: true
-      - attribute: reportingAgent
-        present: false
-    relationship:
-      expires: PT75M
-      relationshipType: HOSTS
-      source:
-        buildGuid:
-          account:
-            attribute: accountId
-          domain:
-            value: INFRA
-          type:
-            value: HOST
-            valueInGuid: NA
-          identifier:
-            fragments:
-              - attribute: fullHostname
-            hashAlgorithm: FARM_HASH
+        lookupGuid:
+          candidateCategory: HOST
+          fields:
+            - field: onHostEntityHostname
+              attribute: hostname
       target:
         extractGuid:
           attribute: entity.guid