Skip to content
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

chore(deps): update dependency pytz to v2024 - abandoned #2558

Closed
wants to merge 18 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2e62bb6
fix: SC4S failed to start, because container with same name
guillerg86 Jun 3, 2024
bd84c8b
chore(deps): update dependency requests to v2.32.3 (#2480)
renovate[bot] Jun 4, 2024
5d0e4d8
chore(deps): update dependency pytest to v8.2.1 (#2468)
renovate[bot] Jun 4, 2024
d55b35c
chore(deps): update dependency pre-commit to v3.7.1 (#2454)
renovate[bot] Jun 4, 2024
2cef6c3
chore(deps): update dependency mkdocs-material to v9.5.25 (#2422)
renovate[bot] Jun 4, 2024
300a554
chore(deps): update dependency typing-extensions to v4.12.1 (#2482)
renovate[bot] Jun 4, 2024
ec3e7e8
chore(deps): update dependency flake8 to v7.1.0 (#2503)
renovate[bot] Jun 19, 2024
f187b04
chore(deps): update docker/build-push-action action to v6 (#2504)
renovate[bot] Jun 19, 2024
9cad36a
chore(deps): update dependency pytest to v8.2.2 (#2486)
renovate[bot] Jun 19, 2024
dd3545f
chore(deps): update dependency mkdocs-material to v9.5.27 (#2490)
renovate[bot] Jun 19, 2024
f63bf3f
chore(deps): update dependency typing-extensions to v4.12.2 (#2491)
renovate[bot] Jun 19, 2024
0476771
chore(deps): update dependency pre-commit to v3.8.0 (#2540)
renovate[bot] Jul 31, 2024
1f7b047
chore(deps): update dependency pytest to v8.3.2 (#2532)
renovate[bot] Jul 31, 2024
820d298
fix: Updating the restart to 'on-failure' and a minor fix (#2543)
cwadhwani-splunk Aug 5, 2024
9b47f21
feat: add aruba silverpeak parser (#2537)
wojtekzyla Aug 5, 2024
5ec9a7e
revert unnecessary changes from tests/test_aruba.py (#2560)
wojtekzyla Aug 16, 2024
3b038b9
Update sc4s.service
mstopa-splunk Aug 20, 2024
deb0470
chore(deps): update dependency pytz to v2024
renovate[bot] Aug 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-lite.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push action
id: docker_action_build
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
provenance: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push action
id: docker_action_build
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
provenance: false
Expand Down
4 changes: 3 additions & 1 deletion ansible/resources/docker_sc4s.service
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ ExecStartPre=/usr/bin/docker pull $SC4S_IMAGE
# when startup fails on running bash check if the path is correct
ExecStartPre=/usr/bin/bash -c "/usr/bin/systemctl set-environment SC4SHOST=$(hostname -s)"

# Note: Prevent the error 'The container name "/SC4S" is already in use by container <container_id>. You have to remove (or rename) that container to be able to reuse that name.'
ExecStartPre=/usr/bin/bash -c "/usr/bin/docker rm SC4S > /dev/null 2>&1 || /usr/bin/true"
ExecStart=/usr/bin/docker run \
-e "SC4S_CONTAINER_HOST=${SC4SHOST}" \
-v "$SC4S_PERSIST_MOUNT" \
Expand All @@ -41,4 +43,4 @@ ExecStart=/usr/bin/docker run \
--name SC4S \
--rm $SC4S_IMAGE

Restart=on-abnormal
Restart=on-failure
4 changes: 3 additions & 1 deletion ansible/resources/podman_sc4s.service
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ ExecStartPre=/usr/bin/podman pull $SC4S_IMAGE
# when startup fails on running bash check if the path is correct
ExecStartPre=/usr/bin/bash -c "/usr/bin/systemctl set-environment SC4SHOST=$(hostname -s)"

# Note: Prevent the error 'The container name "/SC4S" is already in use by container <container_id>. You have to remove (or rename) that container to be able to reuse that name.'
ExecStartPre=/usr/bin/bash -c "/usr/bin/podman rm SC4S > /dev/null 2>&1 || /usr/bin/true"
ExecStart=/usr/bin/podman run \
-e "SC4S_CONTAINER_HOST=${SC4SHOST}" \
-v "$SC4S_PERSIST_MOUNT" \
Expand All @@ -42,4 +44,4 @@ ExecStart=/usr/bin/podman run \
--name SC4S \
--rm $SC4S_IMAGE

Restart=on-abnormal
Restart=on-failure
4 changes: 3 additions & 1 deletion docs/resources/docker/sc4s.service
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ ExecStartPre=/usr/bin/docker pull $SC4S_IMAGE
# when startup fails on running bash check if the path is correct
ExecStartPre=/usr/bin/bash -c "/usr/bin/systemctl set-environment SC4SHOST=$(hostname -s)"

# Note: Prevent the error 'The container name "/SC4S" is already in use by container <container_id>. You have to remove (or rename) that container to be able to reuse that name.'
ExecStartPre=/usr/bin/bash -c "/usr/bin/docker rm SC4S > /dev/null 2>&1 || /usr/bin/true"
ExecStart=/usr/bin/docker run \
-e "SC4S_CONTAINER_HOST=${SC4SHOST}" \
-v "$SC4S_PERSIST_MOUNT" \
Expand All @@ -41,4 +43,4 @@ ExecStart=/usr/bin/docker run \
--name SC4S \
--rm $SC4S_IMAGE

Restart=on-abnormal
Restart=on-failure
4 changes: 3 additions & 1 deletion docs/resources/podman/sc4s.service
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ ExecStartPre=/usr/bin/podman pull $SC4S_IMAGE
# when startup fails on running bash check if the path is correct
ExecStartPre=/usr/bin/bash -c "/usr/bin/systemctl set-environment SC4SHOST=$(hostname -s)"

# Note: Prevent the error "Can't create container because exists another container with SC4S name"
ExecStartPre=/usr/bin/podman rm SC4S > /dev/null 2>&1 || /usr/bin/true
ExecStart=/usr/bin/podman run \
-e "SC4S_CONTAINER_HOST=${SC4SHOST}" \
-v "$SC4S_PERSIST_MOUNT" \
Expand All @@ -42,4 +44,4 @@ ExecStart=/usr/bin/podman run \
--name SC4S \
--rm $SC4S_IMAGE

Restart=on-abnormal
Restart=on-failure
44 changes: 44 additions & 0 deletions docs/sources/vendor/Aruba/silverpeak.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Silverpeak

## Key facts

* Requires vendor product by source configuration
* Legacy BSD Format default port 514

## Links

| Ref | Link |
|----------------|---------------------------------------------------------------------------------------------------------|

## Sourcetypes

| sourcetype | notes |
|------------------|-------|
| aruba:silverpeak | |


### Index Configuration

| key | index | notes |
|------------------------------------------|--------|----------------|
| aruba_silverpeak | netops | none |


## Parser Configuration

```c
#/opt/sc4s/local/config/app-parsers/app-vps-aruba_silverpeak.conf
#File name provided is a suggestion it must be globally unique

application app-vps-test-aruba_silverpeak[sc4s-vps] {
filter {
host("silverpeak-" type(string) flags(prefix))
};
parser {
p_set_netsource_fields(
vendor('aruba')
product('silverpeak')
);
};
};
```
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
block parser app-netsource-aruba_silverpeak() {
channel {
rewrite {
r_set_splunk_dest_default(
index('netops')
sourcetype('aruba:silverpeak')
vendor('aruba')
product('silverpeak')
);
};
};
};


application app-netsource-aruba_silverpeak[sc4s-network-source] {
filter {
not filter(f_is_source_identified)
and (
(
match("aruba", value('.netsource.sc4s_vendor'), type(string))
and match("silverpeak", value('.netsource.sc4s_product'), type(string))
)
and (tags("ns_vendor:aruba") and tags("ns_product:silverpeak"))
or tags(".source.s_ARUBA_SILVERPEAK")
or "${.netsource.sc4s_vendor_product}" eq "aruba_silverpeak"
)
;
};
parser { app-netsource-aruba_silverpeak(); };
};


11 changes: 11 additions & 0 deletions package/etc/test_parsers/app-vps-test-aruba_silverpeak.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
application app-vps-aruba_silverpeak[sc4s-vps] {
filter {
host("silverpeak-" type(string) flags(prefix))
};
parser {
p_set_netsource_fields(
vendor('aruba')
product('silverpeak')
);
};
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
block parser app-netsource-aruba_silverpeak() {
channel {
rewrite {
r_set_splunk_dest_default(
index('netops')
sourcetype('aruba:silverpeak')
vendor('aruba')
product('silverpeak')
);
};
};
};


application app-netsource-aruba_silverpeak[sc4s-network-source] {
filter {
not filter(f_is_source_identified)
and (
(
match("aruba", value('.netsource.sc4s_vendor'), type(string))
and match("silverpeak", value('.netsource.sc4s_product'), type(string))
)
and (tags("ns_vendor:aruba") and tags("ns_product:silverpeak"))
or tags(".source.s_ARUBA_SILVERPEAK")
or "${.netsource.sc4s_vendor_product}" eq "aruba_silverpeak"
)
;
};
parser { app-netsource-aruba_silverpeak(); };
};
63 changes: 37 additions & 26 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading