Skip to content

Commit 69fb3d0

Browse files
authored
Merge pull request #95 from f5devcentral/development
Release v0.8.0
2 parents e2aa467 + 83aaf84 commit 69fb3d0

21 files changed

+5292
-121
lines changed

.github/workflows/push-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
password: ${{ secrets.GITLAB_PASSWORD }}
1919
- name: Set variables
2020
run: |
21-
VER=$(cat VERSION)
21+
VER=$(cat COLLECTOR_VERSION)
2222
echo "VERSION=$VER" >> $GITHUB_ENV
2323
- name: Pull Gitlab Image
2424
run: docker pull registry.gitlab.com/f5/greenhouse/apps/seven-layer-cake-collector/otel_custom_collector:${{ env.VERSION }}

COLLECTOR_VERSION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v0.8.0

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@ Application Study Tool config management relies on default configs in
8080

8181
Settings in the bigip_receivers.yaml override those in ast_defaults.yaml.
8282

83-
To update a legacy (pre v0.6.0) configuration, to the new scheme see
84-
[Config Migration for Pre v0.6.0 Deployments](https://f5devcentral.github.io/application-study-tool/config/config_migration.html)
8583

8684
## Configure Default Device Settings
8785

@@ -342,7 +340,7 @@ special instructions / breaking changes.
342340
```shell
343341
git stash
344342
git pull origin main
345-
git checkout tags/RELEASE_VERSION #(e.g. tags/v0.7.0)
343+
git checkout tags/RELEASE_VERSION #(e.g. tags/v0.8.0)
346344
git stash pop
347345
```
348346

VERSION

Lines changed: 0 additions & 1 deletion
This file was deleted.

config/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@ Files in this directory can be used to configure aspects of the Application Stud
55
For additional detail, see:
66

77
* [Configuration Management](pages/config_management.md) (new users start here)
8-
* [Pre v0.6.0 Config Migration](pages/config_migration.md)

config/ast_defaults.yaml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,27 @@ bigip_receiver_defaults:
88
# The password (not recommended) or a reference to an env variable (recommended, shown)
99
# Below tells the collector to look for an environment variable named BIGIP_PASSWORD_1
1010
password: "${env:BIGIP_PASSWORD_1}"
11-
# The timeout field can be used to adjust the amount of time the collector will wait for a response
11+
# The timeout field can be used to adjust the maximum amount of time the collector will wait for a response
1212
# to BigIP iControl Rest requests. Larger boxes with more complex config may require setting this value
13-
# higher. Set for individual devices in bigip_receivers.yaml
14-
timeout: 10s
15-
# The data_types that should be enabled or disabled. DNS and GTM users can enable those modules
13+
# higher.
14+
# This value should be less than or equal to the collection_interval. Any requests that haven't completed
15+
# before this timer expires (starting at the beginning of the collection interval) will be cancelled.
16+
# You can set this for individual devices in bigip_receivers.yaml.
17+
timeout: 60s
18+
# The data_types that should be enabled or disabled. Default-disabled module users can enable those modules
1619
# by setting the below to true. These will apply to all devices and may be better specified on the
17-
# per-reciever settings file below.
20+
# per-reciever settings file.
1821
data_types:
22+
f5.apm:
23+
enabled: false
24+
f5.cgnat:
25+
enabled: false
1926
f5.dns:
2027
enabled: false
28+
f5.dos:
29+
enabled: false
30+
f5.firewall:
31+
enabled: false
2132
f5.gtm:
2233
enabled: false
2334
# The TLS settings to use. Either a CA file must be specified or insecure_skip_verify

config/bigip_receivers.yaml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
bigip/1:
77
# Endpoint must be specified for each device
88
# Set this to the management IP for the device. This must be
9-
# reachable from the Application Study Tool host.
9+
# reachable from the Application Study Tool host (port 443).
1010
endpoint: https://10.0.0.1
1111
## Uncommenting any of the following lines will override the defaults in
1212
## ast_defaults.yaml bigip_receiver_defaults section.
@@ -15,10 +15,18 @@ bigip/1:
1515
# collection_interval: 30s
1616
# timeout: 20s
1717
# data_types:
18-
# f5.dns:
19-
# enabled: false
20-
# f5.gtm:
21-
# enabled: false
18+
# f5.apm:
19+
# enabled: false
20+
# f5.cgnat:
21+
# enabled: false
22+
# f5.dns:
23+
# enabled: false
24+
# f5.dos:
25+
# enabled: false
26+
# f5.firewall:
27+
# enabled: false
28+
# f5.gtm:
29+
# enabled: false
2230
# tls:
2331
# insecure_skip_verify: true
2432
# ca_file:

docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ services:
2727
- 7lc_network
2828

2929
otel-collector:
30-
image: ghcr.io/f5devcentral/application-study-tool/otel_custom_collector:v0.7.0
30+
image: ghcr.io/f5devcentral/application-study-tool/otel_custom_collector:v0.8.0
3131
restart: unless-stopped
3232
volumes:
3333
- ./services/otel_collector:/etc/otel-collector-config

0 commit comments

Comments
 (0)