chore: updates to match latest CLI spec (#101)

Co-authored-by: Chris Trombley <[email protected]>
newrelic · Dec 9, 2020 · 12d6027 · 12d6027
1 parent e0c0c72
commit 12d6027
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 26 deletions.
diff --git a/docs/README.md b/docs/README.md
@@ -77,7 +77,7 @@ All recipes can either run in interactive mode where users are prompted for conf
 
 The `newrelic-cli` injects at runtime of a go-task the following variables:
 
-* `{{.NR_LICENSE_KEY}}` populated by the key associated with the profile run with the CLI
+* `{{.NEW_RELIC_LICENSE_KEY}}` populated by the key associated with the profile run with the CLI
 * Input Variables - recipes can use `inputVars` to prompt the user to enter variables needed in the recipe.
 
   ```bash
@@ -119,7 +119,7 @@ setup_license:
       fi
     - |
       # Check for a license_key in the file and update it if it exists; otherwise, write a license_key into the file
-      grep -q '^license_key' /etc/newrelic-infra.yml && sudo sed -i 's/^license_key.*/license_key: {{.NR_LICENSE_KEY}}/' /etc/newrelic-infra.yml || echo 'license_key: {{.NR_LICENSE_KEY}}' | sudo tee -a /etc/newrelic-infra.yml
+      grep -q '^license_key' /etc/newrelic-infra.yml && sudo sed -i 's/^license_key.*/license_key: {{.NEW_RELIC_LICENSE_KEY}}/' /etc/newrelic-infra.yml || echo 'license_key: {{.NEW_RELIC_LICENSE_KEY}}' | sudo tee -a /etc/newrelic-infra.yml
 ```
 
 Another approach might be:
@@ -139,7 +139,7 @@ setup_license:
       sudo touch /etc/newrelic-infra.yml;
     - |
       # write the license_key into the newrelic-infra.yml config
-      echo -e "license_key: {{.NR_LICENSE_KEY}}" >> /etc/newrelic-infra.yml
+      echo -e "license_key: {{.NEW_RELIC_LICENSE_KEY}}" >> /etc/newrelic-infra.yml
 ```
 
 ### Installing latest version of a given Agent/OHI should happen automatically

diff --git a/docs/recipe-spec/recipe-spec.md b/docs/recipe-spec/recipe-spec.md
@@ -95,7 +95,7 @@ install: string, required
 
   # DO NOT USE: License Key is automatically injected by the newrelic-cli
   # env:
-  #   NR_LICENSE_KEY: '{{.NR_LICENSE_KEY}}'
+  #   NEW_RELIC_LICENSE_KEY: '{{.NEW_RELIC_LICENSE_KEY}}'
 
   variables:
     - FOO_VAR: foo-value
@@ -113,7 +113,7 @@ install: string, required
     install_infra:
       cmds:
         - echo "Installing the Infrastructure agent"
-        - curl -L https://raw.githubusercontent.com/fryckbos/infra-install/master/install.sh {{.NR_LICENSE_KEY}} | sh
+        - curl -L https://raw.githubusercontent.com/fryckbos/infra-install/master/install.sh {{.NEW_RELIC_LICENSE_KEY}} | sh
       silent: true
 
 ```

diff --git a/docs/recipe-spec/spec.json b/docs/recipe-spec/spec.json
@@ -34,7 +34,7 @@
     "secret": false,
     "default": "/var/log/messages,/var/log/cloud-init.log,/var/log/secure"
   }],
-  "validationNrql": "SELECT count(*) from SystemSample where hostname like 'HOSTNAME' SINCE 10 minutes ago",
+  "validationNrql": "SELECT count(*) from SystemSample where hostname like '{{.HOSTNAME}}' SINCE 10 minutes ago",
   "preInstall": {
     "prompt": "Message about things user should know"
   },

diff --git a/examples/sample-linux-infrastructure.yaml b/examples/sample-linux-infrastructure.yaml
@@ -62,5 +62,5 @@ install:
     install_infra:
       cmds:
         - echo "Installing the Infrastructure agent"
-        - curl -L https://raw.githubusercontent.com/fryckbos/infra-install/master/install.sh {{.NR_LICENSE_KEY}} | sh
+        - curl -L https://raw.githubusercontent.com/fryckbos/infra-install/master/install.sh {{.NEW_RELIC_LICENSE_KEY}} | sh
       silent: true
diff --git a/recipes/newrelic/infra-agent/amazonlinux2.yml b/recipes/newrelic/infra-agent/amazonlinux2.yml
@@ -20,7 +20,7 @@ keywords:
 processMatch:
   - /infra/
 
-validationNrql: "SELECT count(*) from SystemSample where hostname like 'HOSTNAME' SINCE 10 minutes ago"
+validationNrql: "SELECT count(*) from SystemSample where hostname like '{{.HOSTNAME}}' SINCE 10 minutes ago"
 
 # go-task yaml definition goes here
 # This spec - https://github.com/go-task/task
@@ -40,7 +40,7 @@ install:
             sudo touch /etc/newrelic-infra.yml;
           fi
         - |
-          grep -q '^license_key' /etc/newrelic-infra.yml && sudo sed -i 's/^license_key.*/license_key: {{.NR_LICENSE_KEY}}/' /etc/newrelic-infra.yml || echo 'license_key: {{.NR_LICENSE_KEY}}' | sudo tee -a /etc/newrelic-infra.yml
+          grep -q '^license_key' /etc/newrelic-infra.yml && sudo sed -i 's/^license_key.*/license_key: {{.NEW_RELIC_LICENSE_KEY}}/' /etc/newrelic-infra.yml || echo 'license_key: {{.NEW_RELIC_LICENSE_KEY}}' | sudo tee -a /etc/newrelic-infra.yml
 
     install_infra:
       cmds:

diff --git a/recipes/newrelic/infra-agent/centos_rhel.yml b/recipes/newrelic/infra-agent/centos_rhel.yml
@@ -34,7 +34,7 @@ keywords:
 processMatch:
   - /infra/
 
-validationNrql: "SELECT count(*) from SystemSample where hostname like 'HOSTNAME' SINCE 10 minutes ago"
+validationNrql: "SELECT count(*) from SystemSample where hostname like '{{.HOSTNAME}}' SINCE 10 minutes ago"
 
 # go-task yaml definition goes here
 # This spec - https://github.com/go-task/task
@@ -54,7 +54,7 @@ install:
             sudo touch /etc/newrelic-infra.yml;
           fi
         - |
-          grep -q '^license_key' /etc/newrelic-infra.yml && sudo sed -i 's/^license_key.*/license_key: {{.NR_LICENSE_KEY}}/' /etc/newrelic-infra.yml || echo 'license_key: {{.NR_LICENSE_KEY}}' | sudo tee -a /etc/newrelic-infra.yml
+          grep -q '^license_key' /etc/newrelic-infra.yml && sudo sed -i 's/^license_key.*/license_key: {{.NEW_RELIC_LICENSE_KEY}}/' /etc/newrelic-infra.yml || echo 'license_key: {{.NEW_RELIC_LICENSE_KEY}}' | sudo tee -a /etc/newrelic-infra.yml
 
     install_infra:
       cmds:

diff --git a/recipes/newrelic/infra-agent/debian.yml b/recipes/newrelic/infra-agent/debian.yml
@@ -22,7 +22,7 @@ keywords:
 processMatch:
   - /infra/
 
-validationNrql: "SELECT count(*) from SystemSample where hostname like 'HOSTNAME' SINCE 10 minutes ago"
+validationNrql: "SELECT count(*) from SystemSample where hostname like '{{.HOSTNAME}}' SINCE 10 minutes ago"
 
 # go-task yaml definition goes here
 # This spec - https://github.com/go-task/task
@@ -43,7 +43,7 @@ install:
           fi
           sudo touch /etc/newrelic-infra.yml;
         - |
-          grep -q '^license_key' /etc/newrelic-infra.yml && sudo sed -i 's/^license_key.*/license_key: {{.NR_LICENSE_KEY}}/' /etc/newrelic-infra.yml || echo 'license_key: {{.NR_LICENSE_KEY}}' | sudo tee -a /etc/newrelic-infra.yml
+          grep -q '^license_key' /etc/newrelic-infra.yml && sudo sed -i 's/^license_key.*/license_key: {{.NEW_RELIC_LICENSE_KEY}}/' /etc/newrelic-infra.yml || echo 'license_key: {{.NEW_RELIC_LICENSE_KEY}}' | sudo tee -a /etc/newrelic-infra.yml
 
     install_infra:
       cmds:

diff --git a/recipes/newrelic/infra-agent/suse.yml b/recipes/newrelic/infra-agent/suse.yml
@@ -20,7 +20,7 @@ keywords:
 processMatch:
   - /infra/
 
-validationNrql: "SELECT count(*) from SystemSample where hostname like 'HOSTNAME' SINCE 10 minutes ago"
+validationNrql: "SELECT count(*) from SystemSample where hostname like '{{.HOSTNAME}}' SINCE 10 minutes ago"
 
 # go-task yaml definition goes here
 # This spec - https://github.com/go-task/task
@@ -41,7 +41,7 @@ install:
           fi
           sudo touch /etc/newrelic-infra.yml;
         - |
-          echo -e "license_key: {{.NR_LICENSE_KEY}}" >> /etc/newrelic-infra.yml
+          echo -e "license_key: {{.NEW_RELIC_LICENSE_KEY}}" >> /etc/newrelic-infra.yml
 
     install_infra:
       cmds:

diff --git a/recipes/newrelic/infra-agent/ubuntu.yml b/recipes/newrelic/infra-agent/ubuntu.yml
@@ -24,7 +24,7 @@ keywords:
 processMatch:
   - /infra/
 
-validationNrql: "SELECT count(*) from SystemSample where hostname like 'HOSTNAME' SINCE 10 minutes ago"
+validationNrql: "SELECT count(*) from SystemSample where hostname like '{{.HOSTNAME}}' SINCE 10 minutes ago"
 
 # go-task yaml definition goes here
 # This spec - https://github.com/go-task/task
@@ -45,7 +45,7 @@ install:
           fi
           sudo touch /etc/newrelic-infra.yml;
         - |
-          echo -e "license_key: {{.NR_LICENSE_KEY}}" >> /etc/newrelic-infra.yml
+          echo -e "license_key: {{.NEW_RELIC_LICENSE_KEY}}" >> /etc/newrelic-infra.yml
 
     install_infra:
       cmds:

diff --git a/recipes/newrelic/nginx/debian.yml b/recipes/newrelic/nginx/debian.yml
@@ -31,7 +31,7 @@ logMatch:
     attributes:
       logtype: nginx-error
 
-validationNrql: "SELECT count(*) from NginxSample where hostname like 'HOSTNAME' SINCE 10 minutes ago"
+validationNrql: "SELECT count(*) from NginxSample where hostname like '{{.HOSTNAME}}' SINCE 10 minutes ago"
 
 install:
   version: "3"

diff --git a/recipes/newrelic/nginx/rhel.yml b/recipes/newrelic/nginx/rhel.yml
@@ -35,7 +35,7 @@ logMatch:
     attributes:
       logtype: nginx-error
 
-validationNrql: "SELECT count(*) from NginxSample where hostname like 'HOSTNAME' SINCE 10 minutes ago"
+validationNrql: "SELECT count(*) from NginxSample where hostname like '{{.HOSTNAME}}' SINCE 10 minutes ago"
 
 install:
   version: "3"

diff --git a/recipes/newrelic/nginx/suse.yml b/recipes/newrelic/nginx/suse.yml
@@ -28,7 +28,7 @@ logMatch:
     attributes:
       logtype: nginx-error
 
-validationNrql: "SELECT count(*) from NginxSample where hostname like 'HOSTNAME' SINCE 10 minutes ago"
+validationNrql: "SELECT count(*) from NginxSample where hostname like '{{.HOSTNAME}}' SINCE 10 minutes ago"
 
 install:
   version: "3"

diff --git a/recipes/newrelic/node-agent/node.yml b/recipes/newrelic/node-agent/node.yml
@@ -45,9 +45,9 @@ install:
             echo "Enter a name for your application and press [ENTER]:"
             read appname
             echo ""
-            if [ -z "{{.NR_LICENSE_KEY}}" ]; then
+            if [ -z "{{.NEW_RELIC_LICENSE_KEY}}" ]; then
               echo "Please provide a license key and press [ENTER]:"
-              read NR_LICENSE_KEY
+              read NEW_RELIC_LICENSE_KEY
               echo ""
             fi
             echo "Writing the newrelic.js configuration file."
@@ -66,7 +66,7 @@ install:
               /**
                * Your New Relic license key.
                */
-              license_key: '{{.NR_LICENSE_KEY}}',
+              license_key: '{{.NEW_RELIC_LICENSE_KEY}}',
               /**
                * This setting controls distributed tracing.
                * Distributed tracing lets you see the path that a request takes through your

diff --git a/test/deploy/assertions/recipe-is-valid/roles/onafterstart/tasks/nrql_has_data.yml b/test/deploy/assertions/recipe-is-valid/roles/onafterstart/tasks/nrql_has_data.yml
@@ -4,7 +4,7 @@
   set_fact:
     nrql_query: "{{ nrql_query | regex_replace(item.finder, item.replacer) }}"
   with_items:
-    - { finder: '(.*)(HOSTNAME)(.*)', replacer: "'\\1{{hostname_output.stdout}}\\3'" }
+    - { finder: '(.*)(\{\{\.HOSTNAME\}\})(.*)', replacer: "'\\1{{hostname_output.stdout}}\\3'" }
 - name: trim eventual quotes
   set_fact:
     nrql_query: "{{ nrql_query | regex_replace(item.finder, item.replacer) }}"

diff --git a/validator/schema-v1.json b/validator/schema-v1.json
@@ -48,7 +48,7 @@
                     "default": "/var/log/messages,/var/log/cloud-init.log,/var/log/secure"
                 }
             ],
-            "validationNrql": "SELECT count(*) from SystemSample where hostname like 'HOSTNAME' SINCE 10 minutes ago",
+            "validationNrql": "SELECT count(*) from SystemSample where hostname like '{{.HOSTNAME}}' SINCE 10 minutes ago",
             "preInstall": {
                 "prompt": "Message about things user should know"
             },
@@ -482,7 +482,7 @@
             "description": "An explanation about the purpose of this instance.",
             "default": "",
             "examples": [
-                "SELECT count(*) from SystemSample where hostname like 'HOSTNAME' SINCE 10 minutes ago"
+                "SELECT count(*) from SystemSample where hostname like '{{.HOSTNAME}}' SINCE 10 minutes ago"
             ]
         },
         "preInstall": {