Skip to content

LOG-12482 fix reading token #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alestrunda merged 5 commits into from
Jun 18, 2021
Merged

LOG-12482 fix reading token #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
430321a
fix parsing token
alestrunda Jun 16, 2021
6ee7467
update readme
alestrunda Jun 17, 2021
a277805
ehnance token parsing
alestrunda Jun 17, 2021
16ed604
enhance token parsing
alestrunda Jun 17, 2021
77f7630
Fix typos in messages.
Jun 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions Linux Script/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
Linux Script
============
# Linux Script

## Configure

Configure your Linux system to send syslogs to Loggly using the following command

sudo bash configure-linux.sh -a SUBDOMAIN -u USERNAME

```bash
sudo bash configure-linux.sh -a SUBDOMAIN -u USERNAME
```

You can also pass your *customer token* as `-t TOKEN`. If it's omitted, the token will be loaded automatically.

## Stop

Stop sending your Linux System logs to Loggly

sudo bash configure-linux.sh -a SUBDOMAIN -r
```bash
sudo bash configure-linux.sh -a SUBDOMAIN -r
```
9 changes: 3 additions & 6 deletions Linux Script/configure-linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,10 +384,7 @@ getAuthToken() {
if [ "$LOGGLY_AUTH_TOKEN" = "" ]; then
logMsgToConfigSysLog "INFO" "INFO: Authentication token not provided. Trying to retrieve it from $LOGGLY_ACCOUNT_URL account."
#get authentication token if user has not provided one
tokenstr=$(curl -s -u $LOGGLY_USERNAME:$LOGGLY_PASSWORD $LOGGLY_ACCOUNT_URL/apiv2/customer | grep -v "token")

#get the string from index 0 to first occurence of ,
tokenstr=${tokenstr%%,*}
tokenstr=$(curl -s -u $LOGGLY_USERNAME:$LOGGLY_PASSWORD $LOGGLY_ACCOUNT_URL/apiv2/customer | grep -A1 "\"tokens\":" | grep -v "tokens")

#get the string from index 0 to last occurence of "
tokenstr=${tokenstr%\"*}
Expand Down Expand Up @@ -498,7 +495,7 @@ checkAuthTokenAndWriteContents() {
writeContents $LOGGLY_ACCOUNT $LOGGLY_AUTH_TOKEN $LOGGLY_DISTRIBUTION_ID $LOGS_01_HOST $LOGGLY_SYSLOG_PORT
restartRsyslog
else
logMsgToConfigSysLog "ERROR" "ERROR: Loggly auth token is required to configure rsyslog. Please pass -a <auth token> while running script."
logMsgToConfigSysLog "ERROR" "ERROR: Loggly auth token is required to configure rsyslog. Please pass -t <auth token> while running script."
exit 1
fi
}
Expand All @@ -512,7 +509,7 @@ setPathToCABundle () {
CA_FILE_PATH="/etc/ssl/certs/ca-bundle.crt"
;;
*)
logMsgToConfigSysLog "WARN" "WARN: The linux distribution '$LINUX_DIST' has not been previously tested with Loggly. Verify path to the file with root CA certificates (usually stored in OS trust store) in '$RSYSLOG_ETCDIR_CONF' -> '\$DefaultNetstreamDriverCAFile' and restart rsyslog service or re-run script with '--inssecure' attribute. Default path to CA file is '$CA_FILE_PATH'."
logMsgToConfigSysLog "WARN" "WARN: The linux distribution '$LINUX_DIST' has not been previously tested with Loggly. Verify path to the file with root CA certificates (usually stored in OS trust store) in '$RSYSLOG_ETCDIR_CONF' -> '\$DefaultNetstreamDriverCAFile' and restart rsyslog service or re-run script with '--insecure' attribute. Default path to CA file is '$CA_FILE_PATH'."
;;
esac
}
Expand Down