Skip to content

Commit

Permalink
fix: release 1.12.1 (#1118)
Browse files Browse the repository at this point in the history
* chore: upgrade deprecated semgrep (#1106)

Signed-off-by: Ilya Kheifets <ikheifets@splunk.com>

* fix: refactor enrich (#1100)

* chore(release): 1.12.1-beta.1

## [1.12.1-beta.1](v1.12.0...v1.12.1-beta.1) (2024-10-18)

### Bug Fixes

* refactor enrich ([#1100](#1100)) ([cbdc062](cbdc062))

* chore: add .semgrepignore to exclude tests from analyze (#1107)

Signed-off-by: Ilya Kheifets <ikheifets@splunk.com>

* docs: refactor documentation (#1112)

* fix: refactor docker compose files (#1105)

* chore(release): 1.12.1-beta.2

## [1.12.1-beta.2](v1.12.1-beta.1...v1.12.1-beta.2) (2024-10-29)

### Bug Fixes

* refactor docker compose files ([#1105](#1105)) ([feab1e2](feab1e2))

* fix: add docker dns for ipv6 (#1115)

* chore(release): 1.12.1-beta.3

## [1.12.1-beta.3](v1.12.1-beta.2...v1.12.1-beta.3) (2024-11-05)

### Bug Fixes

* add docker dns for ipv6 ([#1115](#1115)) ([8209ba8](8209ba8))

* chore: update version (#1117)

---------

Signed-off-by: Ilya Kheifets <ikheifets@splunk.com>
Co-authored-by: Ilya Kheifets <138466237+ikheifets-splunk@users.noreply.github.com>
Co-authored-by: srv-rr-github-token <94607705+srv-rr-github-token@users.noreply.github.com>
  • Loading branch information
3 people authored Nov 5, 2024
1 parent 997f982 commit c5a4ed9
Show file tree
Hide file tree
Showing 90 changed files with 1,484 additions and 1,414 deletions.
18 changes: 12 additions & 6 deletions .github/workflows/ci-main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,11 @@ jobs:
FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }}
semgrep-scan:
name: semgrep
runs-on: ubuntu-latest
if: (github.actor != 'dependabot[bot]')
steps:
- uses: actions/checkout@v4
- uses: semgrep/semgrep-action@v1
with:
publishToken: ${{ secrets.SEMGREP_APP_TOKEN }}
uses: splunk/sast-scanning/.github/workflows/sast-scan.yml@main
secrets: inherit
with:
block_mode: "on"
pre-commit:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -140,6 +138,10 @@ jobs:
steps:
- name: Checkout Project
uses: actions/checkout@v4
- name: Setup python
uses: actions/setup-python@v5
with:
python-version: "3.10"
- name: run install_microk8s.sh
run: |
sudo snap install microk8s --classic --channel=1.30/stable
Expand All @@ -162,6 +164,10 @@ jobs:
steps:
- name: Checkout Project
uses: actions/checkout@v4
- name: Setup python
uses: actions/setup-python@v5
with:
python-version: "3.10"
- name: Install docker compose
run: |
# Add Docker's official GPG key:
Expand Down
8 changes: 6 additions & 2 deletions .semgrepignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
Dockerfile
integration_tests/
docs/
test/
ui_tests/
integration_tests/
rendered/
examples/
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@

### Fixed

## [1.12.1]

### Changed
- general refactor of documentation
- merge docker compose files into one

### Fixed
- dns resolution for ipv6

## [1.12.0]

### Changed
Expand Down
4 changes: 2 additions & 2 deletions charts/splunk-connect-for-snmp/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ type: application
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)

version: 1.12.0
version: 1.12.1-beta.3
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "1.12.0"
appVersion: "1.12.1-beta.3"
#
dependencies:
- name: mongodb
Expand Down
14 changes: 7 additions & 7 deletions charts/splunk-connect-for-snmp/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ sim:
scheduler:
### Group definitions ###
# Create the group definition in case you want to configure polling from multiple hosts
# at once, more on this: https://splunk.github.io/splunk-connect-for-snmp/main/configuration/configuring-groups/
# at once, more on this: https://splunk.github.io/splunk-connect-for-snmp/main/microk8s/configuration/configuring-groups/

#groups: |
# example_group_1:
Expand All @@ -150,7 +150,7 @@ scheduler:

### Profiles definitions ###
# Create a profile definition to set varbinds you want to poll from the device.
# more on this: https://splunk.github.io/splunk-connect-for-snmp/main/configuration/configuring-profiles/
# more on this: https://splunk.github.io/splunk-connect-for-snmp/main/microk8s/configuration/configuring-profiles/

#profiles: |
# smart_profile:
Expand Down Expand Up @@ -195,7 +195,7 @@ scheduler:
profiles: ""

# mapping MIB fields to custom names
# more: https://splunk.github.io/splunk-connect-for-snmp/main/configuration/configuring-profiles/#custom-translations
# more: https://splunk.github.io/splunk-connect-for-snmp/main/microk8s/configuration/configuring-profiles/#custom-translations
customTranslations: {}

# set CPU and Memory limits for a scheduler pod
Expand All @@ -217,7 +217,7 @@ scheduler:

poller:
# Appending OID indexes to metrics.
# https://splunk.github.io/splunk-connect-for-snmp/main/configuration/poller-configuration/#append-oid-index-part-to-the-metrics
# https://splunk.github.io/splunk-connect-for-snmp/main/microk8s/configuration/poller-configuration/#append-oid-index-part-to-the-metrics
metricsIndexingEnabled: false

# Enable polling base profiles (with IF-MIB and SNMPv2-MIB) from
Expand All @@ -229,11 +229,11 @@ poller:
maxOidToProcess: 70

# list of kubernetes secrets name that will be used for polling
# https://splunk.github.io/splunk-connect-for-snmp/main/configuration/poller-configuration/#define-usernamesecrets
# https://splunk.github.io/splunk-connect-for-snmp/main/microk8s/configuration/poller-configuration/#define-usernamesecrets
usernameSecrets: []

# Here is where polling happens. Learn more on how to configure it here:
# https://splunk.github.io/splunk-connect-for-snmp/main/configuration/poller-configuration/
# https://splunk.github.io/splunk-connect-for-snmp/main/microk8s/configuration/poller-configuration/

#inventory: |
# address,port,version,community,secret,security_engine,walk_interval,profiles,smart_profiles,delete
Expand All @@ -242,7 +242,7 @@ poller:

worker:
# workers are responsible for the actual execution of polling, processing trap messages, and sending data to Splunk.
# More: https://splunk.github.io/splunk-connect-for-snmp/main/configuration/worker-configuration/
# More: https://splunk.github.io/splunk-connect-for-snmp/main/microk8s/configuration/worker-configuration/

# The poller worker consumes all the tasks related to polling
poller:
Expand Down
5 changes: 3 additions & 2 deletions docker_compose/.env
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# Deployment configuration
SC4SNMP_IMAGE=ghcr.io/splunk/splunk-connect-for-snmp/container
SC4SNMP_TAG="1.12.0"
SC4SNMP_TAG="1.12.1-beta.3"
SCHEDULER_CONFIG_FILE_ABSOLUTE_PATH=
TRAPS_CONFIG_FILE_ABSOLUTE_PATH=
INVENTORY_FILE_ABSOLUTE_PATH=
COREFILE_ABS_PATH=
COREDNS_ADDRESS=172.28.0.255
SC4SNMP_VERSION="1.12.0"
COREDNS_ADDRESS_IPv6=fd02:0:0:0:7fff:ffff:ffff:ffff
SC4SNMP_VERSION="1.12.1-beta.3"
IPv6_ENABLED=false

# Dependencies images
Expand Down
2 changes: 1 addition & 1 deletion docker_compose/Corefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
errors
auto
reload
forward . 8.8.8.8
forward . 8.8.8.8 2001:4860:4860::8888
}
15 changes: 0 additions & 15 deletions docker_compose/docker-compose-coredns.yaml

This file was deleted.

40 changes: 0 additions & 40 deletions docker_compose/docker-compose-dependencies.yaml

This file was deleted.

36 changes: 0 additions & 36 deletions docker_compose/docker-compose-inventory.yaml

This file was deleted.

11 changes: 0 additions & 11 deletions docker_compose/docker-compose-network.yaml

This file was deleted.

33 changes: 0 additions & 33 deletions docker_compose/docker-compose-scheduler.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions docker_compose/docker-compose-secrets.yaml

This file was deleted.

51 changes: 0 additions & 51 deletions docker_compose/docker-compose-traps.yaml

This file was deleted.

Loading

0 comments on commit c5a4ed9

Please sign in to comment.