-
Notifications
You must be signed in to change notification settings - Fork 248
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Updates beacon agent on-prem DSN examples #6213
Open
ksnavely
wants to merge
3
commits into
develop
Choose a base branch
from
UPM-40771-agent-docs
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,7 +16,7 @@ Before you begin, you need to have the following: | |
|
||
You need to enable the system you are planning on running the agent on to download packages from the EDB repositories for EDB Postgres AI. | ||
|
||
Locate your EDB subscription token on the the [EnterpriseDB repos download page](https://www.enterprisedb.com/repos-downloads). | ||
Locate your EDB subscription token on the [EnterpriseDB repos download page](https://www.enterprisedb.com/repos-downloads). | ||
|
||
Using the retrieved subscription token, set an environmental variables (`EDB_SUBSCRIPTION_TOKEN`) to the token's value. Also set an environmental variable for your EDB subscription type (`EDB_SUBSCRIPTION_TYPE`) to one of `standard` or `enterprise` depending on which plan you are signed up to: | ||
|
||
|
@@ -84,7 +84,9 @@ export BEACON_AGENT_PROJECT_ID=<your-project-id> | |
|
||
These environment variables are used when you run the `beacon-agent setup` command to create a configuration file in the Beacon configuration directory. | ||
|
||
You also need to specify the Beacon configuration directory for storing the configuration file and the name of the configuration file to generate there. The `$HOME/.beacon/` file is one of the default locations which `beacon_agent` searches for `beacon_agent.yaml` when it starts. Using the `-file` flag tells the agent setup process to create its configuration file in a specific location. | ||
You also need to specify the Beacon configuration directory for storing the configuration file and the name of the configuration file to generate there. | ||
The `$HOME/.beacon/` file is one of the default locations which `beacon_agent` searches for `beacon_agent.yaml` when it starts. | ||
Using the `-file` flag tells the agent setup process to create its configuration file in a specific location. | ||
|
||
``` | ||
beacon-agent setup -file="$HOME/.beacon/beacon_agent.yaml" | ||
|
@@ -114,16 +116,14 @@ Entries under `databases` utilize the following format: | |
|
||
```yaml | ||
databases: | ||
<database_name_1>: | ||
dsn: "$DSN1" | ||
tags: | ||
- "<tag-one>" | ||
- "<tag-two>" | ||
<database_name_2>: | ||
dsn: "$DSN2" | ||
tags: | ||
- "<tag-one>" | ||
- "<tag-two>" | ||
- dsn: "$DSN1" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. As above - we have another PR where resource_id is used. The other option is that resource_id has been dropped, so in that case we should have a formal reference for the yaml in here. |
||
tags: | ||
- "<tag-one>" | ||
- "<tag-two>" | ||
- dsn: "$DSN2" | ||
tags: | ||
- "<tag-one>" | ||
- "<tag-two>" | ||
``` | ||
|
||
Here is an example `beacon_agent.yaml` file configured for a database named `sales_reporting`: | ||
|
@@ -141,12 +141,11 @@ agent: | |
- "onprem" | ||
provider: | ||
onprem: | ||
databases: | ||
sales_reporting: | ||
dsn: "$DSN" | ||
databases: | ||
- dsn: “$DSN” | ||
tags: | ||
- "sales" | ||
- "reports" | ||
- "sales" | ||
- "reports" | ||
host: | ||
resource_id: "postgresql.lan" | ||
tags: [] | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In https://github.com/EnterpriseDB/docs/pull/6105/files a resource_id key is used; are we skipping it here for compactness?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Resource id is an allowed field according to the code https://github.com/EnterpriseDB/upm-beacon/blob/79f12896839dd5c8898c97c4ef2591645de57a99/internal/config/agent.go#L211
It is an optional field though, and doesn't need to be specified.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This PR looks totally valid https://github.com/EnterpriseDB/docs/pull/6105/files
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, yes but it also conflicts with your edits which is what I want to resolve. Given the edits in here, I'd like to promote this PR and ensure nothing is lost from the other PR before we close it.