From 00fe59a15db28c425c14acedc52cc61573f175f8 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Mon, 13 Jan 2025 15:33:02 +0100 Subject: [PATCH] contrib: remove prettyprint was introduced by b0447aea601cc066cbbc3dc3a11e2bea609f3bdb long ago better use the command line tool `jq` for that purpose, it's more powerful --- CHANGELOG.md | 1 + contrib/README.md | 1 - contrib/prettyprint/prettyprint.sh | 10 ---------- contrib/prettyprint/prettyprint.txt | 7 ------- 4 files changed, 1 insertion(+), 18 deletions(-) delete mode 100755 contrib/prettyprint/prettyprint.sh delete mode 100644 contrib/prettyprint/prettyprint.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 60dcf37dc..60d878b52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -54,6 +54,7 @@ ### Tools ### Contrib +- Remove `prettyprint` script, use `jq` instead (PR#2551 by Sebastian Wagner). ### Known issues diff --git a/contrib/README.md b/contrib/README.md index eb0df9287..5281a9c53 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 c54ac3bab..000000000 --- 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 d7e74d350..000000000 --- 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