Skip to content

Commit

Permalink
Version 1137 (#59) (#60)
Browse files Browse the repository at this point in the history
* Version 1.1.36

- Fix: Avoid mcatalog calls with metric_name as metric_name, some versions of Splunk will incorrectly complain about this, and this causes appinpsect failures in Splunk Base

* Version 1.1.37
  • Loading branch information
guilhemmarchand committed Sep 9, 2020
1 parent 2ca7593 commit 98bb1b1
Show file tree
Hide file tree
Showing 16 changed files with 180 additions and 55 deletions.
115 changes: 114 additions & 1 deletion appinspect.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,116 @@
#!/bin/bash

splunk-appinspect inspect `ls telegraf-kafka_*.tgz | head -1` --mode precert --included-tags splunk_appinspect
#set -x
unset username
unset uuid

echo -n "Enter your Splunk Base login: "; read username

echo "Attempting login to appinspect API..."

export appinspect_token=$(curl -X GET \
-u ${username} \
--url "https://api.splunk.com/2.0/rest/login/splunk" -s | sed 's/%//g' | jq -r .data.token)

case "$appinspect_token" in
"null")
echo "ERROR: login to appinspect API has failed, an authentication token could be not be generated."; exit 1
;;
*)
echo "SUCCESS: Authentication was successful and we got a token."
;;
esac

for app in $(ls *.tgz); do

echo -n "RUN: Please confirm submitting the app ${app} to appinspect API vetting (yes / no) ? "; read submit
case ${submit} in
y|yes|Yes)
echo "RUN: Please wait while submitting to appinspect..."
uuid=$(curl -X POST \
-H "Authorization: bearer ${appinspect_token}" \
-H "Cache-Control: no-cache" \
-s \
-F "app_package=@${app}" \
-F "included_tags=cloud" \
--url "https://appinspect.splunk.com/v1/app/validate" | jq -r .links | grep href | head -1 | awk -F\" '{print $4}' | awk -F\/ '{print $6}')

if [ $? -eq 0 ]; then
echo "INFO: upload was successful, polling status..."

status=$(curl -X GET \
-s \
-H "Authorization: bearer ${appinspect_token}" \
--url https://appinspect.splunk.com/v1/app/validate/status/${uuid} | jq -r .status)

while [ $status != "SUCCESS" ]; do

echo -e "INFO: appinspect is currently running: \n"
echo "INFO: Sleeping 2 seconds..."

curl -X GET \
-s \
-H "Authorization: bearer ${appinspect_token}" \
--url https://appinspect.splunk.com/v1/app/validate/status/${uuid} | jq
sleep 2
status=$(curl -X GET \
-s \
-H "Authorization: bearer ${appinspect_token}" \
--url https://appinspect.splunk.com/v1/app/validate/status/${uuid} | jq -r .status)

done

case ${status} in
"SUCCESS")
echo "INFO: appinspect review was successfully proceeded:"
curl -X GET \
-s \
-H "Authorization: bearer ${appinspect_token}" \
--url https://appinspect.splunk.com/v1/app/validate/status/${uuid} | jq .
echo -e "RUN: Download the HTML report in the current directory? (yes / no) "; read download

case ${download} in
y|yes|Yes)
datetime=$(date '+%m%d%Y_%H%M%S')
filename="appinspect_report_${datetime}.html"
curl -X GET \
-s \
-H "Authorization: bearer ${appinspect_token}" \
-H "Cache-Control: no-cache" \
-H "Content-Type: text/html" \
--url "https://appinspect.splunk.com/v1/app/report/${uuid}" \
-o ${filename}

echo "INFO: report downloaded to file ${filename} in the current directory."

;;
n|no|No)
echo "INFO: Operation completed for ${app} - thank you."
;;
esac

;;
"*")
echo "ERROR: appinspect review was not successful!"
;;

esac

else
echo "ERROR: upload has failed!"
break

fi

;;
n|no|No)

echo "INFO: Application was not submitted"

;;

esac

done

exit 0
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ app="telegraf-kafka"
version=`grep 'version =' telegraf-kafka/default/app.conf | awk '{print $3}' | sed 's/\.//g'`

rm -f *.tgz
tar -cvzf ${app}_${version}.tgz --exclude=telegraf-kafka/local --exclude=telegraf-kafka/metadata/local.meta --exclude=telegraf-kafka/lookups/lookup_file_backups telegraf-kafka
tar -czf ${app}_${version}.tgz --exclude=telegraf-kafka/local --exclude=telegraf-kafka/metadata/local.meta --exclude=telegraf-kafka/lookups/lookup_file_backups telegraf-kafka
echo "Wrote: ${app}_${version}.tgz"

exit 0
12 changes: 12 additions & 0 deletions docs/releasenotes.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
Release notes
#############

==============
Version 1.1.37
==============

CAUTION: Zookeeper metric collection switches from Telegraf plugin to JMX for easier and more consistent metric collection across all the components.
If you were using the application prior to this version, please update your configuration to collect metrics via JMX.

See: https://telegraf-kafka.readthedocs.io/en/latest/implementation.html

- Fix: Show Kafka Connect tasks return empty results in home page
- Fix: The usage of unit makes single form content way too small in different views

==============
Version 1.1.36
==============
Expand Down
2 changes: 1 addition & 1 deletion telegraf-kafka/default/app.conf
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ label = Kafka Smart Monitoring
[launcher]
author = Guilhem Marchand
description = Kafka Smart Monitoring provides advanced and fast monitoring of Kafka and Confluent streaming platform
version = 1.1.36
version = 1.1.37
12 changes: 6 additions & 6 deletions telegraf-kafka/default/data/ui/views/mobile_kafka_brokers.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@
<option name="rangeColors">["0x006d9c","0x006d9c"]</option>
<option name="rangeValues">[0]</option>
<option name="refresh.display">progressbar</option>
<option name="underLabel">REALTIME AVG MESSAGES/IN SEC</option>
<option name="unit">msg/sec</option>
<option name="underLabel">REALTIME AVG MESSAGES/IN SEC (msg/sec)</option>
<option name="unit"></option>
<option name="useColors">1</option>
</single>
</panel>
Expand All @@ -102,8 +102,8 @@
<option name="rangeColors">["0x006d9c","0x006d9c"]</option>
<option name="rangeValues">[0]</option>
<option name="refresh.display">progressbar</option>
<option name="underLabel">REALTIME AVG TRAFFIC IN</option>
<option name="unit">Kbps in</option>
<option name="underLabel">REALTIME AVG TRAFFIC IN (Kbps in)</option>
<option name="unit"></option>
<option name="useColors">1</option>
</single>
</panel>
Expand All @@ -123,8 +123,8 @@
<option name="rangeColors">["0x006d9c","0x006d9c"]</option>
<option name="rangeValues">[0]</option>
<option name="refresh.display">progressbar</option>
<option name="underLabel">REALTIME AVG TRAFFIC OUT</option>
<option name="unit">Kbps out</option>
<option name="underLabel">REALTIME AVG TRAFFIC OUT (Kbps out)</option>
<option name="unit"></option>
<option name="useColors">1</option>
</single>
</panel>
Expand Down
18 changes: 9 additions & 9 deletions telegraf-kafka/default/data/ui/views/overview.xml
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@
<option name="rangeValues">[0]</option>
<option name="refresh.display">progressbar</option>
<option name="underLabel">REALTIME AVG MESSAGES/IN SEC</option>
<option name="unit">msg/sec</option>
<option name="unit"></option>
<option name="useColors">1</option>
</single>
</panel>
Expand All @@ -691,8 +691,8 @@
<option name="rangeColors">["0x006d9c","0x006d9c"]</option>
<option name="rangeValues">[0]</option>
<option name="refresh.display">progressbar</option>
<option name="underLabel">REALTIME AVG TRAFFIC IN</option>
<option name="unit">Kbps in</option>
<option name="underLabel">REALTIME AVG TRAFFIC IN (Kbps in)</option>
<option name="unit"></option>
<option name="useColors">1</option>
</single>
</panel>
Expand All @@ -707,8 +707,8 @@
<option name="rangeColors">["0x006d9c","0x006d9c"]</option>
<option name="rangeValues">[0]</option>
<option name="refresh.display">progressbar</option>
<option name="underLabel">REALTIME AVG TRAFFIC OUT</option>
<option name="unit">Kbps out</option>
<option name="underLabel">REALTIME AVG TRAFFIC OUT (Kbps out)</option>
<option name="unit"></option>
<option name="useColors">1</option>
</single>
</panel>
Expand Down Expand Up @@ -1971,8 +1971,8 @@ number_tasks&gt;=1 AND delta_seconds&lt;grace_period AND task_state="running", "
<option name="rangeColors">["0x006d9c","0x006d9c"]</option>
<option name="rangeValues">[0]</option>
<option name="refresh.display">progressbar</option>
<option name="underLabel">REALTIME MESSAGES CONSUMED/SEC</option>
<option name="unit">msg/sec</option>
<option name="underLabel">REALTIME MESSAGES CONSUMED/SEC (msg/sec)</option>
<option name="unit"></option>
<option name="useColors">1</option>
</single>
</panel>
Expand All @@ -1987,8 +1987,8 @@ number_tasks&gt;=1 AND delta_seconds&lt;grace_period AND task_state="running", "
<option name="rangeColors">["0x006d9c","0x006d9c"]</option>
<option name="rangeValues">[0]</option>
<option name="refresh.display">progressbar</option>
<option name="underLabel">REALTIME MESSAGES PRODUCED/SEC</option>
<option name="unit">msg/sec</option>
<option name="underLabel">REALTIME MESSAGES PRODUCED/SEC (msg/sec)</option>
<option name="unit"></option>
<option name="useColors">1</option>
</single>
</panel>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@
<option name="rangeColors">["0x006d9c","0x006d9c"]</option>
<option name="rangeValues">[0]</option>
<option name="refresh.display">progressbar</option>
<option name="underLabel">REALTIME AVG ACTIVE CONNECTIONS</option>
<option name="unit">req/sec</option>
<option name="underLabel">REALTIME AVG ACTIVE CONNECTIONS (req/sec)</option>
<option name="unit"></option>
<option name="useColors">1</option>
</single>
</panel>
Expand All @@ -96,8 +96,8 @@
<option name="rangeColors">["0x006d9c","0x006d9c"]</option>
<option name="rangeValues">[0]</option>
<option name="refresh.display">progressbar</option>
<option name="underLabel">REALTIME AVG OPENED CONNECTIONS RATE</option>
<option name="unit">req/sec</option>
<option name="underLabel">REALTIME AVG OPENED CONNECTIONS RATE (req/sec)</option>
<option name="unit"></option>
<option name="useColors">1</option>
</single>
</panel>
Expand All @@ -112,8 +112,8 @@
<option name="rangeColors">["0x006d9c","0x006d9c"]</option>
<option name="rangeValues">[0]</option>
<option name="refresh.display">progressbar</option>
<option name="underLabel">REALTIME AVG CLOSED CONNECTIONS RATE</option>
<option name="unit">req/sec</option>
<option name="underLabel">REALTIME AVG CLOSED CONNECTIONS RATE (req/sec)</option>
<option name="unit"></option>
<option name="useColors">1</option>
</single>
</panel>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@
<option name="rangeColors">["0x006d9c","0x006d9c"]</option>
<option name="rangeValues">[0]</option>
<option name="refresh.display">progressbar</option>
<option name="underLabel">REALTIME MESSAGES CONSUMED/SEC</option>
<option name="unit">msg/sec</option>
<option name="underLabel">REALTIME MESSAGES CONSUMED/SEC (msg/sec)</option>
<option name="unit"></option>
<option name="useColors">1</option>
</single>
</panel>
Expand All @@ -156,8 +156,8 @@
<option name="rangeColors">["0x006d9c","0x006d9c"]</option>
<option name="rangeValues">[0]</option>
<option name="refresh.display">progressbar</option>
<option name="underLabel">REALTIME MESSAGES PRODUCED/SEC</option>
<option name="unit">msg/sec</option>
<option name="underLabel">REALTIME MESSAGES PRODUCED/SEC (msg/sec)</option>
<option name="unit"></option>
<option name="useColors">1</option>
</single>
</panel>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@
<option name="rangeColors">["0x006d9c","0x006d9c"]</option>
<option name="rangeValues">[0]</option>
<option name="refresh.display">progressbar</option>
<option name="underLabel">REALTIME AVG ACTIVE CONNECTIONS</option>
<option name="unit">req/sec</option>
<option name="underLabel">REALTIME AVG ACTIVE CONNECTIONS (req/sec)</option>
<option name="unit"></option>
<option name="useColors">1</option>
</single>
</panel>
Expand All @@ -96,8 +96,8 @@
<option name="rangeColors">["0x006d9c","0x006d9c"]</option>
<option name="rangeValues">[0]</option>
<option name="refresh.display">progressbar</option>
<option name="underLabel">REALTIME AVG OPENED CONNECTIONS RATE</option>
<option name="unit">req/sec</option>
<option name="underLabel">REALTIME AVG OPENED CONNECTIONS RATE (req/sec)</option>
<option name="unit"></option>
<option name="useColors">1</option>
</single>
</panel>
Expand All @@ -112,8 +112,8 @@
<option name="rangeColors">["0x006d9c","0x006d9c"]</option>
<option name="rangeValues">[0]</option>
<option name="refresh.display">progressbar</option>
<option name="underLabel">REALTIME AVG CLOSED CONNECTIONS RATE</option>
<option name="unit">req/sec</option>
<option name="underLabel">REALTIME AVG CLOSED CONNECTIONS RATE (req/sec)</option>
<option name="unit"></option>
<option name="useColors">1</option>
</single>
</panel>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@
<option name="rangeColors">["0x006d9c","0x006d9c"]</option>
<option name="rangeValues">[0]</option>
<option name="refresh.display">progressbar</option>
<option name="underLabel">REALTIME AVG MESSAGES/IN SEC</option>
<option name="unit">msg/sec</option>
<option name="underLabel">REALTIME AVG MESSAGES/IN SEC (msg/sec)</option>
<option name="unit"></option>
<option name="useColors">1</option>
</single>
</panel>
Expand All @@ -164,8 +164,8 @@
<option name="rangeColors">["0x006d9c","0x006d9c"]</option>
<option name="rangeValues">[0]</option>
<option name="refresh.display">progressbar</option>
<option name="underLabel">REALTIME AVG TRAFFIC IN</option>
<option name="unit">Kbps in</option>
<option name="underLabel">REALTIME AVG TRAFFIC IN (Kbps in)</option>
<option name="unit"></option>
<option name="useColors">1</option>
</single>
</panel>
Expand All @@ -180,8 +180,8 @@
<option name="rangeColors">["0x006d9c","0x006d9c"]</option>
<option name="rangeValues">[0]</option>
<option name="refresh.display">progressbar</option>
<option name="underLabel">REALTIME AVG TRAFFIC OUT</option>
<option name="unit">Kbps out</option>
<option name="underLabel">REALTIME AVG TRAFFIC OUT (Kbps out)</option>
<option name="unit"></option>
<option name="useColors">1</option>
</single>
</panel>
Expand Down Expand Up @@ -1005,7 +1005,7 @@
<option name="drilldown">none</option>
<option name="rangeColors">["0x53a051","0x0877a6","0xf8be34","0xf1813f","0xdc4e41"]</option>
<option name="underLabel">TOTAL TOPICS</option>
<option name="unit">- Topics</option>
<option name="unit"></option>
<option name="numberPrecision">0</option>
<option name="rangeColors">["0x006d9c","0x006d9c"]</option>
<option name="rangeValues">[0]</option>
Expand All @@ -1021,7 +1021,7 @@
<option name="drilldown">none</option>
<option name="rangeColors">["0x53a051","0x0877a6","0xf8be34","0xf1813f","0xdc4e41"]</option>
<option name="underLabel">TOTAL PARTITIONS</option>
<option name="unit">- Partitions</option>
<option name="unit"></option>
<option name="numberPrecision">0</option>
<option name="rangeColors">["0x006d9c","0x006d9c"]</option>
<option name="rangeValues">[0]</option>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<option name="rangeValues">[0]</option>
<option name="refresh.display">progressbar</option>
<option name="underLabel">NUMBER OF CURRENT TASK(S)</option>
<option name="unit">TASK(S)</option>
<option name="unit"></option>
<option name="useColors">1</option>
</single>
</panel>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<option name="rangeValues">[0]</option>
<option name="refresh.display">progressbar</option>
<option name="underLabel">NUMBER OF CURRENT TASK(S)</option>
<option name="unit">TASK(S)</option>
<option name="unit"></option>
<option name="useColors">1</option>
</single>
</panel>
Expand Down
Loading

0 comments on commit 98bb1b1

Please sign in to comment.