merge in main updates

Author: serverless-mom

site/content/_shared/group-global-variables.md

@@ -0,0 +1,15 @@
+---
+sitemapExclude: true
+---
+
+Add Group variables on the Variables tab in a check group. Group variables are only accessible in the context of a group, which includes the checks within the group and their configuration.
+
+![set group environment variable](/docs/images/browser-checks/group-environment-variables.png)
+
+Add Global variables by clicking "Global variables" on the left-side menu. Global variables are available throughout Checkly, that includes checks, tests, and global configuration options.
+
+![set global environment variable](/docs/images/browser-checks/global-environment-variables.png)
+
+By default, all variables are stored as string values. When using variables, you can click the lock icon to hide the value from all read-only users. Any data you “lock” is encrypted at rest and in flight on our back end and is only decrypted when needed. 
+
+Secrets are never visible for any user, and are always encrypted.

site/content/_shared/variables-and-secrets.md

@@ -0,0 +1,10 @@
+---
+sitemapExclude: true
+---
+
+## Variables and secrets
+There are two ways to store configuration information in Checkly: Variables and secrets. Both variables and secrets are encrypted at rest and in flight.
+- **Variables** are used to store non-sensitive information. Variables are shown in plaintext when being edited, on the check result page and in logs. Variables can be accessed via the CLI and API.
+- **Secrets** allow you to store sensitive data for use in checks. Once saved secrets are never shown in the UI or in logs. The secret value cannot be accessed via the CLI or API.
+
+From here on, in this document, we refer to both variables and secrets as 'variables' for ease of reading, unless explicitly mentioned.

site/content/docs/_index.md

@@ -28,7 +28,7 @@ headerTag="h3"
 title="Terraform"
 img="/docs/images/icons/integrations.svg"
 description="Manage and scale your complete monitoring configuration right from your code base with our official Hashicorp Terraform provider."
-link="/docs/integrations/terraform/"
+link="/docs/terraform-provider/"
 >}}
 </div>
 

site/content/docs/alerting-and-retries/alert-channels.md

@@ -47,5 +47,5 @@ Configuring alert channels is mostly self explanatory except for our [advanced w
 After adding the channels, you either **edit** or **delete** them, or change which checks are subscribed to that specific channel.
 
 {{<info >}}
-If you are using [Terraform](/docs/integrations/terraform), you will need to specify alert channel subscriptions _explicitly_ for each check / group.
+If you are using [Terraform](/docs/terraform-provider/), you will need to specify alert channel subscriptions _explicitly_ for each check / group.
 {{</info >}}

site/content/docs/alerting-and-retries/phone-calls.md

@@ -21,12 +21,14 @@ You can add as many phone number channels as you like.
 | Country |
 | ------ |
 | Australia (+61)             |
+| Belgium (+32)               |
 | Brazil (+55)                |
 | Canada (+1)                 |
 | France (+33)                |
 | Germany (+49)               |
 | India (+91)                 |
 | Lithuania (+370)            |
+| Malta (+356)                |
 | Netherlands (+31)           |
 | Norway (+47)                |
 | Vietnam (+84)               |

site/content/docs/alerting-and-retries/webhooks.md

@@ -20,7 +20,7 @@ nutshell, you can:
 
 The example above shows a webhook configured to create a Jira ticket on each event. Notice the following:
 
-- We use the variable `JIRA_INSTANCE_URL` in the URL. We previously stored this variable in the [environment variables section](https://app.checklyhq.com/environment-variables).
+- We use the variable `JIRA_INSTANCE_URL` in the URL. We previously stored this variable in the [environment variables section](https://app.checklyhq.com/environment-variables). Alerting configurations only support the use of environment variables, secrets are not supported.
 - We use the variable `CHECK_ID` in the payload. This is one of many event-based variables that will change with each call. See below for the complete list.
 
 In both cases we use the familiar Handlebars templating braces, i.e. `{{ }}` to insert the variable.

site/content/docs/api-checks/variables.md

@@ -1,5 +1,5 @@
 ---
-title: Environment variables
+title: Variables and secrets
 weight: 9
 menu:
   resources:
@@ -9,29 +9,23 @@ cli: true
 ---
 
 Multiple API checks can target the same server/service. In this case, your checks might need the same configuration item
-like an authentication token, a specific user name or even just some specific part of the URL. You can use global variables to
+like an authentication token, a specific user name or even just some specific part of the URL. You can use variables to
 'DRY' up your checks and store these variables in just one place.
 
+{{< markdownpartial "_shared/variables-and-secrets.md" >}}
+
 ## Managing variables
 
 You can manage environment variables for API checks at two different levels:
 
 * Group level
 * Global level
 
-Group variables are added on the Variables tab in a group. The variables stored here are accessible only in the group context.
-
-![set group environment variable](/docs/images/api-checks/add-group-variable.png)
-
-Global variables are added on the Variables tab. The variables stored here are globally accessible throughout Checkly, hence the “Global environment variables” title.
-
-![set global environment variable](/docs/images/api-checks/add-global-variable.png)
-
-All variables are stored as string values. You can click the lock icon to encrypt the values and hide the value from all users that do not have write access. Any data you “lock” is encrypted at rest and in flight on our back end and is only decrypted when needed.
+{{< markdownpartial "_shared/group-global-variables.md" >}}
 
 ## Accessing variables in API checks
 
-Environment variables are exposed to your API checks using the common Handlebars/Moustache templating delimiters, i.e. `{{USER_API_KEY}}`. Note that Handlebars (double brackets) variables will be URI encoded. To avoid encoding, you can access your environment variables with triple brackets, i.e. `{{{USER_API_KEY}}}`.
+Variables are exposed to your API checks using the common Handlebars/Moustache templating delimiters, i.e. `{{USER_API_KEY}}`. Note that Handlebars (double brackets) variables will be URI encoded. To avoid encoding, you can access your environment variables with triple brackets, i.e. `{{{USER_API_KEY}}}`.
 Variables can be used in the following API checks fields:
 
 - URL
@@ -40,12 +34,6 @@ Variables can be used in the following API checks fields:
 - Query parameters values
 - Basic authentication username and password
 
-When typing in most of the variable-enabled fields we show a small helper popup to help select the right variable.
-
-![access variables](/docs/images/api-checks/access-variables.png)
-
-Note, just the Body input field does not show this helper popup.
-
 ## Using Handlebars helpers & built in variables
 
 Next to your own variables, we've added some built-in variables and extended the [Handlebars](https://handlebarsjs.com/) templating system:

site/content/docs/browser-checks/_index.md

@@ -114,7 +114,7 @@ test('Login to Checkly', async ({ page }) => { // 2
 
 **4. Fill out input fields and submit:** Using the `page.type()` method we enter our email address and
 password. You would normally use environment variables here to keep sensitive data
-out of your scripts. See [Login scenarios and secrets](/docs/browser-checks/login-and-secrets/) for more info.
+out of your scripts. See [Login scenarios and secrets](/docs/browser-checks/login-scenarios/) for more info.
 
 **5. Click Login button:** We use Playwright's `getByRole()` locator to find the login button and also `.click()` on it right away.
 
@@ -261,7 +261,7 @@ Chrome is being used.
 
 ## Next Steps
 - Learn more about [built-in functionalities of Playwright Test](/docs/browser-checks/playwright-test/).
-- Learn how to deal with [login scenarios and private data](/docs/browser-checks/login-and-secrets/).
+- Learn how to deal with [login scenarios and private data](/docs/browser-checks/login-scenarios/).
 - Use [Playwright Codegen](https://playwright.dev/docs/codegen) to record scripts without coding.
 - Learn more about [taking screenshots](/docs/browser-checks/screenshots/).
 - Learn more about [visual regression & snapshot testing](/docs/browser-checks/visual-regression-snapshot-testing/).

site/content/docs/browser-checks/variables.md

@@ -1,5 +1,5 @@
 ---
-title: Environment variables
+title: Variables and secrets
 weight: 21
 menu:
   resources:
@@ -10,29 +10,23 @@ cli: true
 
 When creating browser checks, you probably run some code locally, store it in a Git repo or copy and paste it around
 a bit. This means the credentials in the script are at risk of being exposed.
-You should therefore **replace any confidential data in your browser check scripts with environment variables.**
+You should therefore **replace any confidential data in your check scripts with variables or secrets.**
 
-## Managing variables
-
-For browser checks, you can create environment variables at three hierarchical levels:
+{{< markdownpartial "_shared/variables-and-secrets.md" >}}
 
-- **Check** level
-- **Group** level
-- **Global** level
-
-Check variables are added on the **Variables** tab for each browser check. 
+## Managing variables
 
-![add local variables](/docs/images/browser-checks/add-local-variable.png)
+You can create variables at three hierarchical levels:
 
-Group variables are added on the **Variables** tab in a [group](/docs/groups/). The variables stored here are accessible
-only in the group context.
+- **Check** level - Browser and multistep check supported.
+- **Group** level - API, browser and multistep check supported.
+- **Global** level - API, browser and multistep check supported.
 
-![add group variables](/docs/images/browser-checks/add-group-variable.png)
+Add variables specific to a Check variables on the **Variables** tab for each browser and multistep check.
 
-Global variables are added on the **Variables** tab. The variables stored here are globally accessible
-throughout Checkly, hence the "Global environment variables" title.
+![add local variables](/docs/images/browser-checks/check-environment-variables.png)
 
-![add global variables](/docs/images/browser-checks/add-global-variable.png)
+{{< markdownpartial "_shared/group-global-variables.md" >}}
 
 {{<info >}}
 Whenever possible, store variables at the global level. This DRY's up your code.
@@ -46,7 +40,7 @@ If you want to avoid team members with Read Only access from viewing environment
 
 ## Accessing variables
 
-Both check, group and global environment variables are accessible in your code using the standard Node.js `process.env.MY_VAR` notation.
+Check, group and global variables are accessible in your code using the standard Node.js `process.env.MY_VAR` notation.
 For example, the code snippet below show how you can log into GitHub. We have more [examples of login scenarios on this page.](/docs/browser-checks/login-scenarios/)
 
 {{< tabs "Variables example" >}}

site/content/docs/cli/command-line-reference.md

@@ -163,11 +163,11 @@ List all available runtimes and their dependencies.
 
 ## `npx checkly env`
 
-Manage the global environment variables of a Checkly account. You can list, add, remove, update and export environment variables.
+Manage the global variables of a Checkly account. You can list, add, remove, update and export environment variables.
 
 ### `npx checkly env pull`
 
-Export global environment variables from your Checkly account to a local `.env` file or a different file of your choice.
+Export global variables from your Checkly account to a local `.env` file or a different file of your choice. For secrets, only the key will be exported, not the value.
 
 ```bash
 checkly env pull [FILENAME] [-f]
@@ -179,51 +179,53 @@ checkly env pull [FILENAME] [-f]
 ```bash
 npx checkly env pull -f
 ```
-Pull all environment variables to the `.env` file and overwrite it if it already exists.
+Pull all global variables to the `.env` file and overwrite it if it already exists.
 
 ### `npx checkly env ls`
 
-List global environment variables. This command does not list environment variables on group or check level.
+List global variables. This command does not list  variables on group or check level. For secrets, only the key name will be shown, not its value.
 
 ```bash
 checkly env ls
 ```
 
 ### `npx checkly env add`
 
-Add a global environment variable.
+Add a global variable.
 
 ```bash
-checkly env add [KEY] [VALUE] [-l]
+checkly env add [KEY] [VALUE] [-l | -s] 
 ```
 
 - `KEY`: Environment variable key.
 - `VALUE`: Environment variable value.
 - `--locked` or `-l`: Indicate that the environment variable will be locked, making it private to all read only users.
+- `--secret` or `-s`: Indicate that the environment variable will be created as a secret. 
 
 
 ### `npx checkly env update`
 
-Update a global environment variable.
+Update a global variable.
 
 ```bash
-checkly env update [KEY] [VALUE] [-l]
+checkly env update [KEY] [VALUE] [-l | -s]
 ```
 
-- `KEY`: Environment variable key.
-- `VALUE`: Environment variable value.
-- `--locked` or `-l`: Indicate that the environment variable will be locked,  making it private to all read only users.
+- `KEY`: Variable key.
+- `VALUE`: Variable value.
+- `--locked` or `-l`: Indicate that the variable will be locked, making it private to all read only users.
+- `--secret` or `-s`: Indicate that the variable will be changed to a secret. Note that secrets cannot be changed to variables. When updating a secret always pass the `-s` flag.
 
 ### `npx checkly env rm`
 
-Remove a global environment variable.
+Remove a global variable.
 
 ```bash
 checkly env rm [KEY] [-f]
 ```
 
-- `KEY`: Environment variable key.
-- `--force` or `-f`: Skips the confirmation dialog when removing an environment.
+- `KEY`: Variable key.
+- `--force` or `-f`: Skips the confirmation dialog when removing a variable.
 
 
 ## `npx checkly sync-playwright`