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

action_update #49

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
name: Checkout to repository
- name: Set up Python 3.7
uses: actions/setup-python@v2
- name: Set up Python 3.10
uses: actions/setup-python@v5
with:
python-version: '3.7'
python-version: '3.10'
- name: Install dependencies
run: |
pip install pipenv
Expand All @@ -32,7 +32,7 @@ jobs:
cd add-on
COPYFILE_DISABLE=1 tar -cvzf $SPL_PATH --exclude='*.pyc' TA-Demisto
- name: Upload tar file to artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: demisto-add-on-for-splunk.tgz
path: ${{ env.SPL_PATH }}
Expand Down
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ pytest = "*"
requests = "*"

[requires]
python_version = "3.7"
python_version = "3.10"
276 changes: 186 additions & 90 deletions Pipfile.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion add-on/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ Once executed, the splunk env will be available at http://localhost:8000.
b. Add a compressed (.tgz) file of your version under add-on/spls path.
To create a compressed file from your local repository, run the following command on the root directory (replace xxx with new version):
```
COPYFILE_DISABLE=1 tar -cvzf add-on/spls/demisto-add-on-for-splunk-xxx.tgz --exclude={'*.pyc','*DS_Store'} TA-Demisto
pushd add-on && COPYFILE_DISABLE=1 tar -cvzf spls/demisto-add-on-for-splunk-xxx.tgz --exclude={'*.pyc','*DS_Store'} TA-Demisto && popd
```

c. Verify AppInspect passes in the build.
Expand Down
2 changes: 1 addition & 1 deletion add-on/TA-Demisto/app.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"id": {
"group": null,
"name": "TA-Demisto",
"version": "4.2.0"
"version": "4.2.1"
},
"author": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"meta": {
"name": "TA-Demisto",
"displayName": "Demisto Add-On for Splunk",
"version": "4.2.0",
"version": "4.2.1",
"restRoot": "TA_Demisto",
"_uccVersion": "5.39.0",
"schemaVersion": "0.0.3"
Expand Down
22 changes: 18 additions & 4 deletions add-on/TA-Demisto/bin/ta_demisto/aob_py3/splunklib/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2011-2015 Splunk, Inc.
# Copyright © 2011-2024 Splunk, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"): you may
# not use this file except in compliance with the License. You may obtain
Expand All @@ -14,7 +14,21 @@

"""Python library for Splunk."""

from __future__ import absolute_import
from splunklib.six.moves import map
__version_info__ = (1, 6, 18)
import logging

DEFAULT_LOG_FORMAT = '%(asctime)s, Level=%(levelname)s, Pid=%(process)s, Logger=%(name)s, File=%(filename)s, ' \
'Line=%(lineno)s, %(message)s'
DEFAULT_DATE_FORMAT = '%Y-%m-%d %H:%M:%S %Z'


# To set the logging level of splunklib
# ex. To enable debug logs, call this method with parameter 'logging.DEBUG'
# default logging level is set to 'WARNING'
def setup_logging(level, log_format=DEFAULT_LOG_FORMAT, date_format=DEFAULT_DATE_FORMAT):
logging.basicConfig(level=level,
format=log_format,
datefmt=date_format)


__version_info__ = (2, 1, 0)
__version__ = ".".join(map(str, __version_info__))
Loading