diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0a07ba1..0848cc4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -53,37 +53,14 @@ jobs: path: | splunk_app_3cx.tgz - - name: "Python Installation" - uses: actions/setup-python@v2 + - uses: splunk/appinspect-cli-action@v1 with: - python-version: '3.x' # Version range or exact version of a Python version to use, using SemVer's version range syntax - architecture: 'x64' + app_path: 'splunk_app_3cx.tgz' + result_file: 'app-appinspect-mode-test.json' -# Ref - https://dev.splunk.com/enterprise/docs/developapps/testvalidate/appinspect/splunkappinspectclitool/installappinspect/installappinspectonlinux - - name: "Install App-Inspect" - run: | - sudo apt-get update - sudo apt-get install -y libxml2-dev libxslt-dev lib32z1-dev python-lxml - sudo apt-get install libmagic-dev - pip install https://download.splunk.com/misc/appinspect/splunk-appinspect-latest.tar.gz - - - name: "Running App-Inspect" - run: | - mkdir test_results || true - splunk-appinspect inspect --mode test --data-format junitxml --output-file test_results/appinspect-mode-test.xml splunk_app_3cx.tgz - - - name: "Running Cloud-Inspect" - run: | - splunk-appinspect inspect --mode precert --included-tags cloud --data-format junitxml --output-file test_results/appinspect-mode-cloud.xml splunk_app_3cx.tgz - - uses: actions/upload-artifact@v2 + if: always() with: name: "app_inspect_reports" path: | - test_results - - - - name: "Inspect and Cloud Vetting Check" - run: | - if grep failures=\"[1-9] test_results/appinspect-mode-test.xml; then exit 1; else exit 0; fi - if grep failures=\"[1-9] test_results/appinspect-mode-cloud.xml; then exit 1; else exit 0; fi + app-appinspect-mode-test.json diff --git a/README.md b/README.md index d9cd6cd..3d2403b 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ The Splunk app for 3CX Phone Systems is used to present the 3CX Phone Systems in * Author - CrossRealms International Inc. -* Version - 1.2.0 +* Version - 1.2.1 * Build - 1 * Creates Index - False * Compatible with: @@ -105,6 +105,10 @@ KNOWN LIMITATION RELEASE NOTES ------------- +Version 1.2.1 +* Minor Changes + * Changes to make compatible with Splunk AppInspect + Version 1.2.0 * Overview Dashboard: * Fixed a visualization issue with the Daily Call Expectancy vs Agent Logins dashboard panel. diff --git a/default/app.conf b/default/app.conf index 21eb579..b9b4f41 100644 --- a/default/app.conf +++ b/default/app.conf @@ -10,7 +10,7 @@ label = 3CX PhoneSystem app for Splunk [launcher] author = CrossRealms International Inc. description = 3CX PhoneSystem app for Splunk. -version = 1.2.0 +version = 1.2.1 [package] id = splunk_app_3cx diff --git a/default/data/ui/views/3cx_agent_logins.xml b/default/data/ui/views/3cx_agent_logins.xml index ad1ea2d..954ec03 100644 --- a/default/data/ui/views/3cx_agent_logins.xml +++ b/default/data/ui/views/3cx_agent_logins.xml @@ -1,4 +1,4 @@ -
+
@@ -282,4 +282,4 @@ $ag_avgt$ -
\ No newline at end of file + diff --git a/default/data/ui/views/3cx_call_reports.xml b/default/data/ui/views/3cx_call_reports.xml index ac66048..d258d5d 100644 --- a/default/data/ui/views/3cx_call_reports.xml +++ b/default/data/ui/views/3cx_call_reports.xml @@ -1,4 +1,4 @@ -
+ Note: Not all calls have recordings.
@@ -140,4 +140,4 @@ $hosts4$ $iext$ $exnums$ ($pcallid$) $qcallopt$ - \ No newline at end of file + diff --git a/default/data/ui/views/3cx_overview.xml b/default/data/ui/views/3cx_overview.xml index e0ae09f..f0f35e3 100644 --- a/default/data/ui/views/3cx_overview.xml +++ b/default/data/ui/views/3cx_overview.xml @@ -1,4 +1,4 @@ -
+ Includes statistics for both queue and non-queue calls
@@ -250,4 +250,4 @@ -
\ No newline at end of file + diff --git a/default/data/ui/views/3cx_queue_extensions.xml b/default/data/ui/views/3cx_queue_extensions.xml index 12495fb..80b9e24 100644 --- a/default/data/ui/views/3cx_queue_extensions.xml +++ b/default/data/ui/views/3cx_queue_extensions.xml @@ -1,4 +1,4 @@ -
+
@@ -362,4 +362,4 @@ - \ No newline at end of file + diff --git a/default/data/ui/views/3cx_queue_logins.xml b/default/data/ui/views/3cx_queue_logins.xml index a0a792d..992a1aa 100644 --- a/default/data/ui/views/3cx_queue_logins.xml +++ b/default/data/ui/views/3cx_queue_logins.xml @@ -1,4 +1,4 @@ -
+ View statistics and summaries for Agent login sessions
@@ -260,4 +260,4 @@ $queue_field$ $o_name$ $agnts$ - \ No newline at end of file + diff --git a/default/data/ui/views/3cx_queue_overview.xml b/default/data/ui/views/3cx_queue_overview.xml index e707a46..27aa54d 100644 --- a/default/data/ui/views/3cx_queue_overview.xml +++ b/default/data/ui/views/3cx_queue_overview.xml @@ -1,4 +1,4 @@ -
+ View general queue statistics over a period of time.
@@ -444,4 +444,4 @@ sum(SlaP) as SlaPc by Queue - \ No newline at end of file +