beenull/crowdsec
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

add headers when using raw output (#1087)

Browse source 
* add headers when output raw with cscli
This commit is contained in:
AlteredCoder 2021-12-14 11:09:26 +01:00 committed by GitHub
parent 4c306187a6
commit 01130a5e17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmd/crowdsec-cli/machines.go
View file

@ -144,6 +144,7 @@ Note: This command requires database direct access, so is intended to be run on
}
fmt.Printf("%s", string(x))
} else if csConfig.Cscli.Output == "raw" {
fmt.Printf("machine_id,ip_address,updated_at,validated,version\n")
for _, w := range machines {
var validated string
if w.IsValidated {

6
cmd/crowdsec-cli/utils.go
View file

@ -131,8 +131,12 @@ func ListItem(itemType string, args []string) {
}
fmt.Printf("%s", string(x))
} else if csConfig.Cscli.Output == "raw" {
fmt.Printf("name,status,version,description\n")
for _, v := range hubStatus {
fmt.Printf("%s %s\n", v["name"], v["description"])
if v["local_version"] == "" {
v["local_version"] = "n/a"
}
fmt.Printf("%s,%s,%s,%s\n", v["name"], v["status"], v["local_version"], v["description"])
}
}
}

6
wizard.sh
View file

@ -226,9 +226,9 @@ install_collection() {
HMENU=()
readarray -t AVAILABLE_COLLECTION < <(${CSCLI_BIN_INSTALLED} collections list -o raw -a)
COLLECTION_TO_INSTALL=()
for collect_info in "${AVAILABLE_COLLECTION[@]}"; do
collection="$(echo ${collect_info} | cut -d " " -f1)"
description="$(echo ${collect_info} | cut -d " " -f2-)"
for collect_info in "${AVAILABLE_COLLECTION[@]:1}"; do
collection="$(echo ${collect_info} | cut -d "," -f1)"
description="$(echo ${collect_info} | cut -d "," -f4)"
in_array $collection "${DETECTED_SERVICES[@]}"
if [[ $? == 0 ]]; then
HMENU+=("${collection}" "${description}" "ON")