Skip to content

Commit 7e0df68

Browse files
authored
Website Updates (#555)
Addresses #531 ChangeLog: - Fixed website icons - Updating websited docs and updating release changelog
1 parent 2632615 commit 7e0df68

3 files changed

Lines changed: 136 additions & 108 deletions

File tree

Lines changed: 88 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,88 @@
1-
# mounts
2-
## archetypes
3-
[[mounts]]
4-
source = "node_modules/@hyas/doks-core/archetypes"
5-
target = "archetypes"
6-
7-
[[mounts]]
8-
source = "archetypes"
9-
target = "archetypes"
10-
11-
## assets
12-
[[mounts]]
13-
source = "node_modules/@hyas/core/assets"
14-
target = "assets"
15-
# excludeFiles = ["scss/app.scss", "js/app.js"]
16-
17-
[[mounts]]
18-
source = "node_modules/@hyas/images/assets"
19-
target = "assets"
20-
21-
[[mounts]]
22-
source = "node_modules/@hyas/doks-core/assets"
23-
target = "assets"
24-
25-
[[mounts]]
26-
source = "node_modules/@tabler/icons/icons"
27-
target = "assets/svgs/tabler-icons"
28-
29-
[[mounts]]
30-
source = "assets"
31-
target = "assets"
32-
33-
## content
34-
[[mounts]]
35-
source = "content"
36-
target = "content"
37-
38-
## data
39-
[[mounts]]
40-
source = "node_modules/@hyas/doks-core/data"
41-
target = "data"
42-
43-
[[mounts]]
44-
source = "data"
45-
target = "data"
46-
47-
## i18n
48-
[[mounts]]
49-
source = "node_modules/@hyas/doks-core/i18n"
50-
target = "i18n"
51-
52-
[[mounts]]
53-
source = "i18n"
54-
target = "i18n"
55-
56-
## layouts
57-
[[mounts]]
58-
source = "node_modules/@hyas/core/layouts"
59-
target = "layouts"
60-
61-
[[mounts]]
62-
source = "node_modules/@hyas/seo/layouts"
63-
target = "layouts"
64-
65-
[[mounts]]
66-
source = "node_modules/@hyas/images/layouts"
67-
target = "layouts"
68-
69-
[[mounts]]
70-
source = "node_modules/@hyas/doks-core/layouts"
71-
target = "layouts"
72-
73-
[[mounts]]
74-
source = "node_modules/@hyas/inline-svg/layouts"
75-
target = "layouts"
76-
77-
[[mounts]]
78-
source = "layouts"
79-
target = "layouts"
80-
81-
## static
82-
[[mounts]]
83-
source = "node_modules/@hyas/doks-core/static"
84-
target = "static"
85-
86-
[[mounts]]
87-
source = "static"
88-
target = "static"
1+
# mounts
2+
## archetypes
3+
[[mounts]]
4+
source = "node_modules/@hyas/doks-core/archetypes"
5+
target = "archetypes"
6+
7+
[[mounts]]
8+
source = "archetypes"
9+
target = "archetypes"
10+
11+
## assets
12+
[[mounts]]
13+
source = "node_modules/@hyas/core/assets"
14+
target = "assets"
15+
# excludeFiles = ["scss/app.scss", "js/app.js"]
16+
17+
[[mounts]]
18+
source = "node_modules/@hyas/images/assets"
19+
target = "assets"
20+
21+
[[mounts]]
22+
source = "node_modules/@hyas/doks-core/assets"
23+
target = "assets"
24+
25+
[[mounts]]
26+
source = "node_modules/@tabler/icons/icons/outline"
27+
target = "assets/svgs/tabler-icons"
28+
29+
[[mounts]]
30+
source = "assets"
31+
target = "assets"
32+
33+
## content
34+
[[mounts]]
35+
source = "content"
36+
target = "content"
37+
38+
## data
39+
[[mounts]]
40+
source = "node_modules/@hyas/doks-core/data"
41+
target = "data"
42+
43+
[[mounts]]
44+
source = "data"
45+
target = "data"
46+
47+
## i18n
48+
[[mounts]]
49+
source = "node_modules/@hyas/doks-core/i18n"
50+
target = "i18n"
51+
52+
[[mounts]]
53+
source = "i18n"
54+
target = "i18n"
55+
56+
## layouts
57+
[[mounts]]
58+
source = "node_modules/@hyas/core/layouts"
59+
target = "layouts"
60+
61+
[[mounts]]
62+
source = "node_modules/@hyas/seo/layouts"
63+
target = "layouts"
64+
65+
[[mounts]]
66+
source = "node_modules/@hyas/images/layouts"
67+
target = "layouts"
68+
69+
[[mounts]]
70+
source = "node_modules/@hyas/doks-core/layouts"
71+
target = "layouts"
72+
73+
[[mounts]]
74+
source = "node_modules/@hyas/inline-svg/layouts"
75+
target = "layouts"
76+
77+
[[mounts]]
78+
source = "layouts"
79+
target = "layouts"
80+
81+
## static
82+
[[mounts]]
83+
source = "node_modules/@hyas/doks-core/static"
84+
target = "static"
85+
86+
[[mounts]]
87+
source = "static"
88+
target = "static"

website/content/docs/gdg/getting_started.md

Lines changed: 34 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: "Getting Started"
33
weight: 11
44
---
55

6-
### Setup new configuration
6+
## Setup new configuration
77

88
You can create new context configuration using an interactive setup.
99
```
@@ -17,15 +17,15 @@ When creating a new context, you will be asked for authorization type, your defa
1717
3. Wildcard configuration (all folders)
1818

1919

20-
### Authentication Concepts
20+
## Authentication Concepts
2121

22-
First let's touch on a few things regrading grafana and authentication. You can connect to the grafana API (which is what GDG is using)
22+
First let's touch on a few things regrading Grafana and authentication. You can connect to the Grafana API (which is what GDG is using)
2323
by either using basic authentication (aka. username/password) or using a service token.
2424

2525
Tokens are bound to a specific org and cannot cross the Org separation no matter what permission they are given.
26-
Users can be grafana admins, org admins ect. What they can/cannot do will vary on what entities you're trying to access.
26+
Users can be Grafana admins, org admins ect. What they can/cannot do will vary on what entities you're trying to access.
2727

28-
Anything do to with Org will require a grafana admin. If you're trying to fetch dashboards a service token will work fine.
28+
Anything to do with Org will require a Grafana admin. If you're trying to fetch dashboards a service token will work fine.
2929

3030

3131

@@ -90,9 +90,17 @@ If not set, it defaults to . `output_path/secure/`
9090

9191
#### Priority
9292

93-
Secure Auth takes precedence over environment variables, and then config file.
93+
{{< callout context="note" title="Note" icon="info-circle" >}}
94+
Secure Auth takes precedence over environment variables and if supported config plaintext values are evaluated last.
95+
96+
i.e.:
97+
98+
1. Secure location is checked first
99+
2. Env is looked up for any matching values
100+
3. Config auth is checked last (No longer supported in +0.9.0)
101+
{{< /callout >}}
94102

95-
### Import / Download Dashboards
103+
## Download Dashboards
96104

97105
Minimal configuration (eg. the `gdg.yml` file) that you need to download your dashboards from your Grafana endpoint:
98106

@@ -102,26 +110,33 @@ context_name: all
102110
contexts:
103111
all:
104112
url: https://grafana.example.org
105-
token: "<<Grafana API Token>>"
106-
# user_name: admin
107-
# password: admin
113+
user_name: admin # Omit if using tokens
108114
output_path: exports
109115
watched:
110116
- Example
111117
- Infrastructure
118+
- MyFolder/.*
119+
- Some+Folder+With+Spaces/subfolder
120+
# Either use dashboard_settings.ignore_filters=true or watched folders.
121+
## The setting below will ignore all watched folders fetch everything.
122+
dashboard_settings:
123+
ignore_filters: false # When set to true all Watched filtered folders will be ignored and ALL folders will be acted on
112124
113125
global:
114126
debug: true
115127
ignore_ssl_errors: false
116128
```
117129
You need to adjust three parts in the configuration in order to function:
118130
- Grafana URL: This is just a URL where your Grafana is available.
119-
- API Key OR Username / Passoword for Admin user. See [authentication](configuration.md) section if you need more information.
120-
- Downloaded Folders: The `watched` field defines folders which will be considered for manipulation. You can see these folders in your Grafana Web UI, under Dashboards > Management. From there, you can simply define the folders you want to be downloaded in the `watched` list. The dashboards are downloaded as JSON files in the `$OUTPUT_PATH/dashboards/$GRAFANA_FOLDER_NAME` directory. Where `$OUTPUT_PATH` is the path defined in the `dashboard_output` configuration property and `$GRAFANA_FOLDER_NAME` the name of the folder from which the dashboards were downloaded.
131+
- Set the user_name to the value you want to use.
132+
- You need to either set a ENV value or create an auth_<context_name> with the correct values for your token or password.
133+
- API Key OR Username / Password for Admin user. See [authentication](#authentication-concepts) section above if you need more information.
134+
- Downloaded Folders: The `watched` field defines folders which will be considered for manipulation. You can see these folders in your Grafana Web UI, under Dashboards > Management. From there, you can simply define the folders you want to be downloaded in the `watched` list. The dashboards are downloaded as JSON files in the `$OUTPUT_PATH/org_name/dashboards/$GRAFANA_FOLDER_NAME` directory. Where `$OUTPUT_PATH` is the path defined in the `output_path` configuration property and `$GRAFANA_FOLDER_NAME` the name of the folder from which the dashboards were downloaded.
135+
- The default org_name is "Main Org." which is the default for Grafana, if you renamed your org, please set its name with the property: `organization_name`
121136

122137

123138
{{< callout context="note" title="Note" icon="info-circle" >}}
124-
Starting with verions 0.7.0 regex patterns for folders are now supported, ex: Other|General, folder/*
139+
Starting with version 0.7.0 regex patterns for folders are now supported, ex: Other|General, folder/*
125140
{{< /callout >}}
126141

127142
After you are done, and you can execute `./bin/gdg dash list` successfully, eg.:
@@ -140,11 +155,11 @@ time="2021-08-22T11:11:28+02:00" level=info msg="Listing dashboards for context:
140155
│ 17 │ Cluster Autoscaling │ cluster-autoscaling │ Example │ iHUYtABMk │ https://grafana.example.org/d/iHUYtABMk/cluster-autoscaling │
141156
└────┴───────────────────────────────────┴───────────────────────────────────┴────────────────┴────────────┴────────────────────────────────────────────────────────────────────────────┘
142157
```
143-
After executing `./bin/gdg dash import` you can find the dashboards of the `Infrastructure` folder in the local directory `dashboards/dashboards/Infrastructure` and the dashboards of the `Example` directory in the local directory `dashboards/dashboards/Example`.
158+
After executing `./bin/gdg backup dash download` you can find the dashboards of the `Infrastructure` folder in the local directory `org_main-org/dashboards/Infrastructure` and the dashboards of the `Example` directory in the local directory `org_main-org/dashboards/Example`.
144159

145-
### Export / Upload Dashboards
160+
## Upload Dashboards
146161

147-
Minimal configuration (eg. the `gdg.yml` file) that you need to upload your dashboards from your Grafana endpoint:
162+
Minimal configuration (i.e. the `gdg.yml` file) that you need to upload your dashboards from your Grafana endpoint:
148163
```yaml
149164
context_name: all
150165
@@ -153,7 +168,6 @@ contexts:
153168
url: https://grafana.example.org
154169
token: "<<Grafana API Token>>"
155170
# user_name: admin
156-
# password: admin
157171
output_path: exports
158172
watched:
159173
- Example
@@ -165,8 +179,8 @@ global:
165179
```
166180
You need to adjust three parts in the configuration in order to function:
167181
- Grafana URL: This is just a URL where your Grafana is available.
168-
- API Key OR Username / Passoword for Admin user. See [authentication](configuration.md) section if you need more information.
169-
- Uploaded Folders: The `watched` field defines folders which will be considered for manipulation. The dashboards should be stored as JSON files in the `$OUTPUT_PATH/dashboards/$GRAFANA_FOLDER_NAME` directory. Where `$OUTPUT_PATH` is the path defined in the `dashboard_output` configuration property and `$GRAFANA_FOLDER_NAME` the name of the folder to which the dashboards will be uploaded. In case of the above configuration file, the dashboards should be stored locally in the `dashboards/dashboards/Example` and `dashboards/dashboards/Infrastructure/` directories.
182+
- API Key OR Username / Password for Admin user. See [authentication](configuration.md) section if you need more information.
183+
- Uploaded Folders: The `watched` field defines folders which will be considered for manipulation. The dashboards should be stored as JSON files in the `$OUTPUT_PATH/$ORG_NAME/dashboards/$GRAFANA_FOLDER_NAME` directory. Where `$OUTPUT_PATH` is the path defined in the `output_path` configuration property and `$GRAFANA_FOLDER_NAME` the name of the folder to which the dashboards will be uploaded. In case of the above configuration file, the dashboards should be stored locally in the `exports/org_main-org/dashboards/Example` and `exports/org_main-org/dashboards/Infrastructure/` directories.
170184

171185
```sh
172186
├── bin
@@ -179,4 +193,4 @@ You need to adjust three parts in the configuration in order to function:
179193
| └─ Infrastructure
180194
| └── aws-ecs.json
181195
```
182-
You can execute `./bin/gdg backup dash export` to upload the local dashboards to your Grafana. Afterwards, you can try running `./bin/gdg dash list` in order to confirm that your dashboards were uploaded successfully.
196+
You can execute `./bin/gdg backup dash upload` to upload the local dashboards to your Grafana. Afterwards, you can try running `./bin/gdg dash list` in order to confirm that your dashboards were uploaded successfully.

website/content/docs/releases/gdg_0.9.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,20 @@ weight: 2
88
toc: true
99
---
1010

11+
## Release Notes for v0.9.3
12+
13+
### Changes
14+
15+
### BugFixes
16+
- [#543](https://github.com/esnet/gdg/issues/543) Env vars not working due to a conflict with the secure_location pattern that was previously introduced. Env will work if secure location not used. Next major release (0.10.x) will fix this to allow for Env to take precedence over any config values.
17+
18+
## TechDebt
19+
- Bug [#501](https://github.com/esnet/gdg/issues/501) Fixing issues with test failures due to containers not being available.
20+
- [#539](https://github.com/esnet/gdg/issues/539) Added test to cover to plugin code path.
21+
- [#488](https://github.com/esnet/gdg/issues/488) Added an Env to disable enterprise tests. Allow contributors to not be blocked without a license.
22+
- [#531](https://github.com/esnet/gdg/issues/531) Fixing documentation issues with the Getting Started guide and css/icons rendering behavior.
23+
- General dependency and tooling update, upgrade to go 1.26.0, npm updates
24+
1125
## Release Notes for v0.9.2
1226

1327
This is a quick bug fix release to address the behavior of alert rules. The other changes are enabling encryption for

0 commit comments

Comments
 (0)