diff --git a/.github/workflows/build-pages.yml b/.github/workflows/build-pages.yml index 6ce6826..96775ba 100644 --- a/.github/workflows/build-pages.yml +++ b/.github/workflows/build-pages.yml @@ -35,6 +35,6 @@ jobs: - name: Build Site run: cd ./pages && bundle exec jekyll build - name: Test with html-proofer - run: cd ./pages && bundle exec htmlproofer _site --ignore-urls "/github.com/,/web.archive.org/" --swap-urls '^/application-study-tool/:/' + run: cd ./pages && bundle exec htmlproofer _site --ignore-urls "/github.com/,/web.archive.org/,/developer.hashicorp.com/" --swap-urls '^/application-study-tool/:/' env: NOKOGIRI_USE_SYSTEM_LIBRARIES: true \ No newline at end of file diff --git a/COLLECTOR_VERSION b/COLLECTOR_VERSION index def571d..c1cc381 100644 --- a/COLLECTOR_VERSION +++ b/COLLECTOR_VERSION @@ -1 +1 @@ -v0.9.5 \ No newline at end of file +v0.9.6 \ No newline at end of file diff --git a/README.md b/README.md index 4f43771..bee8c01 100644 --- a/README.md +++ b/README.md @@ -373,7 +373,7 @@ special instructions / breaking changes. git stash git fetch --tags git pull origin main -git checkout tags/RELEASE_VERSION #(e.g. tags/v0.9.5) +git checkout tags/RELEASE_VERSION #(e.g. tags/v0.9.6) git stash pop # # diff --git a/docker-compose.yaml b/docker-compose.yaml index 2a2bba4..f7a2b46 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -28,8 +28,8 @@ services: - 7lc_network otel-collector: - # ghcr.io/f5devcentral/application-study-tool/otel_custom_collector:v0.9.5 - image: ghcr.io/f5devcentral/application-study-tool/otel_custom_collector@sha256:bcb5faa7489849c0ea36ec645a77b50203dbe7378af1bc6e9ebc923430cce634 + # ghcr.io/f5devcentral/application-study-tool/otel_custom_collector:v0.9.6 + image: ghcr.io/f5devcentral/application-study-tool/otel_custom_collector@sha256:47000e10d93934f680760a8b65863227335e5ec9cb7fa9f24ea4d5db2dff0a3d restart: unless-stopped volumes: - ./services/otel_collector:/etc/otel-collector-config diff --git a/pages/Gemfile b/pages/Gemfile index 9cfd417..ea350dd 100644 --- a/pages/Gemfile +++ b/pages/Gemfile @@ -32,7 +32,7 @@ gem "wdm", "~> 0.1", :platforms => [:mingw, :x64_mingw, :mswin] # do not have a Java counterpart. gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby] -gem 'nokogiri', '>= 1.18.8' +gem 'nokogiri', '>= 1.18.9' gem 'rack', '~> 2.2.14' gem 'rspec' diff --git a/pages/Gemfile.lock b/pages/Gemfile.lock index 61696a6..4084b7f 100644 --- a/pages/Gemfile.lock +++ b/pages/Gemfile.lock @@ -89,9 +89,9 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) - nokogiri (1.18.8-arm64-darwin) + nokogiri (1.18.10-arm64-darwin) racc (~> 1.4) - nokogiri (1.18.8-x86_64-linux-gnu) + nokogiri (1.18.10-x86_64-linux-gnu) racc (~> 1.4) pathutil (0.16.2) forwardable-extended (~> 2.6) @@ -151,7 +151,7 @@ DEPENDENCIES http_parser.rb (~> 0.6.0) jekyll (~> 4.3.4) just-the-docs (= 0.10.0) - nokogiri (>= 1.18.8) + nokogiri (>= 1.18.9) rack (~> 2.2.14) rexml (>= 3.3.9) rspec diff --git a/pages/troubleshooting/troubleshooting.md b/pages/troubleshooting/troubleshooting.md index a9c4aba..753435e 100644 --- a/pages/troubleshooting/troubleshooting.md +++ b/pages/troubleshooting/troubleshooting.md @@ -67,7 +67,7 @@ $ docker ps CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES cb4cf8867390 grafana/grafana:11.6.3 "/run.sh" About a minute ago Up 49 seconds 0.0.0.0:3000->3000/tcp grafana bb8891f2cd47 prom/prometheus:v2.53.5 "/bin/prometheus --c…" About a minute ago Up 49 seconds 0.0.0.0:9090->9090/tcp prometheus -df2739cd67cb ghcr.io/f5devcentral/application-study-tool/otel_custom_collector:v0.9.5 "/otelcol-custom --c…" About a minute ago Up 49 seconds 4317/tcp, 55679-55680/tcp application-study-tool-otel-collector-1 +df2739cd67cb ghcr.io/f5devcentral/application-study-tool/otel_custom_collector:v0.9.6 "/otelcol-custom --c…" About a minute ago Up 49 seconds 4317/tcp, 55679-55680/tcp application-study-tool-otel-collector-1 ``` This output shows a problem (Restarting container) for the `application-study-tool-otel-collector-1` @@ -75,7 +75,7 @@ container (the otel collector): ```shell $ docker ps CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES -fdbde8a3ee16 ghcr.io/f5devcentral/application-study-tool/otel_custom_collector:v0.9.5 "/otelcol-custom --c…" 14 seconds ago Restarting (1) 5 seconds ago application-study-tool-otel-collector-1 +fdbde8a3ee16 ghcr.io/f5devcentral/application-study-tool/otel_custom_collector:v0.9.6 "/otelcol-custom --c…" 14 seconds ago Restarting (1) 5 seconds ago application-study-tool-otel-collector-1 b7ef41accd46 grafana/grafana:11.6.3 "/run.sh" 14 seconds ago Up 13 seconds 0.0.0.0:3000->3000/tcp grafana 8edff3e8666e prom/prometheus:v2.53.5 "/bin/prometheus --c…" 14 seconds ago Up 13 seconds 0.0.0.0:9090->9090/tcp prometheus ```