Fixes splunkbase validation errors and renames flare_splunk_integrati…

…on references to flare

.gitignore

@@ -1,10 +1,10 @@
 *.DS_Store
-flare_splunk_integration.tar.gz
+flare.tar.gz
 venv
 venv-tools
-flare_splunk_integration/local
-flare_splunk_integration/metadata/local.meta
+flare/local
+flare/metadata/local.meta
 __pycache__/
 .vscode/
 
-flare_splunk_integration/bin/vendor/*
+flare/bin/vendor/*

Makefile

@@ -6,12 +6,12 @@ build:
 venv: requirements.txt
 	python -m venv venv
 	venv/bin/pip install --upgrade pip
-	venv/bin/pip install --target flare_splunk_integration/bin/vendor -r requirements.txt
-	@find flare_splunk_integration/bin/vendor -type d -name "*.dist-info" -exec rm -r {} +
-	@find flare_splunk_integration/bin/vendor -type d -name "__pycache__" -exec rm -r {} +
-	@rm -rf flare_splunk_integration/bin/vendor/bin
-	@rm -rf flare_splunk_integration/bin/vendor/packaging
-	@rm -rf flare_splunk_integration/bin/vendor/*-stubs
+	venv/bin/pip install --target flare/bin/vendor -r requirements.txt
+	@find flare/bin/vendor -type d -name "*.dist-info" -exec rm -r {} +
+	@find flare/bin/vendor -type d -name "__pycache__" -exec rm -r {} +
+	@rm -rf flare/bin/vendor/bin
+	@rm -rf flare/bin/vendor/packaging
+	@rm -rf flare/bin/vendor/*-stubs
 
 venv-tools: requirements.tools.txt venv
 	rm -rf venv-tools
@@ -24,33 +24,33 @@ clean:
 	@echo "Removing venv and venv-tools."
 	@rm -rf venv
 	@rm -rf venv-tools
-	@rm -rf flare_splunk_integration/bin/vendor
-	@unlink "/Applications/Splunk/etc/apps/flare_splunk_integration" || true
+	@rm -rf flare/bin/vendor
+	@unlink "/Applications/Splunk/etc/apps/flare" || true
 	@echo "Done."
 
 .PHONY: package
-package: flare_splunk_integration/bin/vendor
-	-@rm flare_splunk_integration.tar.gz
-	@find flare_splunk_integration/bin -type d -name "__pycache__" -exec rm -r {} +
+package: flare/bin/vendor
+	-@rm flare.tar.gz
+	@find flare/bin -type d -name "__pycache__" -exec rm -r {} +
 	COPYFILE_DISABLE=1 tar \
-		--exclude='flare_splunk_integration/local' \
-		--exclude='flare_splunk_integration/metadata/local.meta' \
+		--exclude='flare/local' \
+		--exclude='flare/metadata/local.meta' \
 		--format ustar \
 		-cvzf \
-		"flare_splunk_integration.tar.gz" \
-		"flare_splunk_integration"
+		"flare.tar.gz" \
+		"flare"
 
 # This will not work until we get an APPID - need to submit in Splunkbase UI first.
 .PHONY: publish
-publish: flare_splunk_integration.tar.gz
-	curl -u flaresystems --request POST https://splunkbase.splunk.com/api/v1/app/<APPID>/new_release/ -F "files[]=@./flare_splunk_integration.tar.gz" -F "filename=flare_splunk_integration.tar.gz" -F "cim_versions=4.9,4.7" -F "splunk_versions=9.3" -F "visibility=true"
+publish: flare.tar.gz
+	curl -u flaresystems --request POST https://splunkbase.splunk.com/api/v1/app/<APPID>/new_release/ -F "files[]=@./flare.tar.gz" -F "filename=flare.tar.gz" -F "cim_versions=4.9,4.7" -F "splunk_versions=9.3" -F "visibility=true"
 
 # A manual review from the Splunk team will be required to know if we need to fix any of these tag warnings.
 .PHONY: validate
 validate: venv-tools
 	@echo "Running Splunk AppInspect..."
 	@echo "If you get an error about \"libmagic\", run \"brew install libmagic\""
-	@venv-tools/bin/splunk-appinspect inspect --ci "flare_splunk_integration" || \
+	@venv-tools/bin/splunk-appinspect inspect --ci "flare" || \
 	if test  "$$?" -eq "102" || "$$?" -eq "103" ; then \
 		exit 0 ; \
 	else \
@@ -63,7 +63,7 @@ TAGS = advanced_xml alert_actions_conf ast bias cloud csv custom_search_commands
 inspect-tags:
 	@for TAG in $(TAGS); do \
 		echo "Tag: $$TAG" ; \
-		venv-tools/bin/splunk-appinspect inspect --ci --included-tags $$TAG "flare_splunk_integration" ; \
+		venv-tools/bin/splunk-appinspect inspect --ci --included-tags $$TAG "flare" ; \
 	done
 
 .PHONY: test
@@ -87,7 +87,7 @@ lint: mypy format-check
 
 .PHONY: mypy
 mypy: venv-tools
-	venv-tools/bin/mypy flare_splunk_integration
+	venv-tools/bin/mypy flare
 
 .PHONY: splunk-local
 splunk-local: venv
@@ -97,5 +97,5 @@ splunk-local: venv
 		exit 1; \
 	fi
 
-	@unlink "/Applications/Splunk/etc/apps/flare_splunk_integration" || true
-	@ln -s "$(CURDIR)/flare_splunk_integration" "/Applications/Splunk/etc/apps/flare_splunk_integration"
+	@unlink "/Applications/Splunk/etc/apps/flare" || true
+	@ln -s "$(CURDIR)/flare" "/Applications/Splunk/etc/apps/flare"

flare_splunk_integration/appserver/static/javascript/setupPage.js → flare/appserver/static/javascript/setupPage.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var appName = "flare_splunk_integration";
+var appName = "flare";
 
 require.config({
     paths: {

flare_splunk_integration/appserver/static/javascript/views/setupConfiguration.js → flare/appserver/static/javascript/views/setupConfiguration.js

@@ -1,7 +1,7 @@
 import { promisify } from './util.js'
 import * as SplunkHelpers from './configurationFileHelper.js'
 
-const appName = "flare_splunk_integration";
+const appName = "flare";
 const storageRealm = "flare_integration_realm";
 const applicationNameSpace = {
     owner: "nobody",

flare_splunk_integration/bin/flare.py → flare/bin/flare.py

@@ -8,7 +8,7 @@
 from urllib.error import HTTPError
 from vendor.flareio import FlareApiClient
 
-APP_NAME = "flare_splunk_integration"
+APP_NAME = "flare"
 
 
 class FlareAPI(AuthBase):

flare_splunk_integration/bin/input.py → flare/bin/input.py

@@ -8,7 +8,7 @@
 
 from flare import FlareAPI
 
-APP_NAME = "flare_splunk_integration"
+APP_NAME = "flare"
 HOST = "localhost"
 SPLUNK_PORT = 8089
 REALM = APP_NAME + "_realm"

flare/default/app.conf

@@ -0,0 +1,27 @@
+#
+# Splunk app configuration file
+#
+
+[author=Flare Systems, Inc.]
+email = [email protected]
+company = Flare Systems, Inc.
+
+[package]
+id = flare
+
+[install]
+is_configured = 0
+
+[ui]
+is_visible = 1
+label = Flare
+setup_view = configuration
+supported_themes = light, dark
+
+[launcher]
+author = Flare Systems
+description = The Flare app allows you to integrate your Flare alerts with the Splunk platform.
+version = 0.1.0
+
+[triggers]
+reload.flare = simple

flare_splunk_integration/default/inputs.conf → flare/default/inputs.conf

@@ -1,4 +1,4 @@
-[script://$SPLUNK_HOME/etc/apps/flare_splunk_integration/bin/input.py]
+[script://$SPLUNK_HOME/etc/apps/flare/bin/input.py]
 interval = * * * * *
 python.version = python3
 source = Flare

mypy.ini

@@ -1,4 +1,4 @@
 [mypy]
 exclude = (vendor*)/$
 follow_imports = skip
-mypy_path = flare_splunk_integration/bin/vendor
+mypy_path = flare/bin/vendor