diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a5ff90258..7373ebfafa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -97,6 +97,7 @@ Please refer to the [NEWS](NEWS.md) for a list of changes which have an affect o ### Contrib - Bash Completion: Adapt to YAML-style runtime configuration (PR#2642 by Sebastian Wagner, fixes #2094). +- Remove `prettyprint` script, use `jq` instead (PR#2551 by Sebastian Wagner). ### Known issues diff --git a/contrib/README.md b/contrib/README.md index eb0df9287a..5281a9c532 100644 --- a/contrib/README.md +++ b/contrib/README.md @@ -10,7 +10,6 @@ This directory contains contributed scripts which are helpful for maintaining an * **cron-jobs**: cron job files for pulling in newer versions of supporting databases such as pyasn * **logcheck**: logcheck ruleset to filter logs for error messages -* **prettyprint**: prints the json output for file-output bot prettily * **config-backup**: simple Makefile for doing a `make backup` inside of `/opt/intelmq` in order to preserve the latest configurations * **logrotate**: an example configuration for *logrotate* (`/etc/logrotate.d/` directory). * **check_mk**: Scripts for monitoring an IntelMQ instance with Check_MK. diff --git a/contrib/prettyprint/prettyprint.sh b/contrib/prettyprint/prettyprint.sh deleted file mode 100755 index c54ac3babe..0000000000 --- a/contrib/prettyprint/prettyprint.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# SPDX-FileCopyrightText: 2016 Sebastian Wagner -# -# SPDX-License-Identifier: AGPL-3.0-or-later - -while read -r i; -do - echo "$i" | python -m json.tool ; -done < "$1" diff --git a/contrib/prettyprint/prettyprint.txt b/contrib/prettyprint/prettyprint.txt deleted file mode 100644 index d7e74d3504..0000000000 --- a/contrib/prettyprint/prettyprint.txt +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# SPDX-FileCopyrightText: 2016 Sebastian Wagner -# -# SPDX-License-Identifier: AGPL-3.0-or-later - -sh scrips/prettyprint.txt /opt/intelmq/var/lib/bots/file-output/events.txt diff --git a/debian/intelmq-contrib.install b/debian/intelmq-contrib.install index ae375cd049..d2ba8f8652 100644 --- a/debian/intelmq-contrib.install +++ b/debian/intelmq-contrib.install @@ -2,5 +2,4 @@ contrib/eventdb/ /usr/share/intelmq/contrib/ contrib/example-extension-package/ /usr/share/intelmq/contrib/ contrib/feeds-config-generator/ /usr/share/intelmq/contrib/ contrib/malware_name_mapping/ /usr/share/intelmq/contrib/ -contrib/prettyprint/ /usr/share/intelmq/contrib/ contrib/systemd/ /usr/share/intelmq/contrib/