Skip to content

Commit

Permalink
Merge pull request #8 from observIQ/script-naming
Browse files Browse the repository at this point in the history
Update name of the binary for install scripts
  • Loading branch information
camdencheek authored Jul 7, 2020
2 parents 15de5bd + 860235e commit 85b6f56
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ generate:

.PHONY: build
build:
CGO_ENABLED=0 go build -o ./artifacts/bplogagent_$(GOOS)_$(GOARCH) $(BUILD_INFO) .
CGO_ENABLED=0 go build -o ./artifacts/observiq_logagent_$(GOOS)_$(GOARCH) $(BUILD_INFO) .

.PHONY: install
install:
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
## How do I install the agent?
#### Golang Project
```shell
go get github.com/observiq/bplogagent
go get github.com/observiq/observiq-logagent
```
#### Linux
```shell
Expand All @@ -25,7 +25,7 @@ sh -c "$(curl -fsSl https://github.com/observiq/observiq-logagent/releases/lates
#### Manual
```shell
# Example Command
bplogagent --config ./config.yaml --plugin_dir ./plugins --database ./offsets.db
observiq_logagent --config ./config.yaml --plugin_dir ./plugins

# Supported flags:
--config The location of the agent config file
Expand All @@ -37,18 +37,18 @@ bplogagent --config ./config.yaml --plugin_dir ./plugins --database ./offsets.db
#### Linux
```shell
# systemd
systemctl start bplogagent
systemctl start observiq_logagent

# sysv
service bplogagent start
service observiq_logagent start
```
#### Darwin
```shell
launchctl start com.observiq.bplogagent
launchctl start com.observiq.observiq_logagent
```
#### Windows
```pwsh
Start-Service -Name "bplogagent"
Start-Service -Name "observiq-logagent"
```

## How do I configure the agent?
Expand All @@ -73,7 +73,7 @@ pipeline:
If you have [`graphviz`](https://graphviz.org/) installed, you can view the plugin graph with a command like:
```bash
bplogagent graph --config './config.yaml' | dot -Tsvg -o /tmp/graph.svg && open /tmp/graph.svg
observiq_logagent graph --config './config.yaml' | dot -Tsvg -o /tmp/graph.svg && open /tmp/graph.svg
```

## What is a plugin?
Expand All @@ -82,7 +82,7 @@ A plugin is a unit of log monitoring. Each plugin fulfills a specific responsibi
For instance, a user may read lines from a file using the `file_input` plugin. From there, the results of this operation may be sent to a `regex_parser` plugin that creates fields based on a regex pattern. And then finally, these results may be sent to a `file_output` plugin that writes lines to a file.

## What plugins are available?
For more information on what plugins are available and how to configure them, take a look at our [documentation](/docs/README.md).
For more information on what plugins are available and how to configure them, take a look at our [documentation](/docs/README.md).

## Can I write my own plugins?
Yes! You can [compose builtin plugins](/docs/plugins.md).
Expand Down
8 changes: 4 additions & 4 deletions scripts/unix-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
set -e

# Agent Constants
SERVICE_NAME="bplogagent"
BINARY_NAME="bplogagent"
DOWNLOAD_BASE="https://github.com/observiq/bplogagent/releases/latest/download"
SERVICE_NAME="observiq_logagent"
BINARY_NAME="observiq_logagent"
DOWNLOAD_BASE="https://github.com/observiq/observiq-logagent/releases/latest/download"

# Script Constants
PREREQS="curl hostname printf ps sed uname cut tar"
Expand Down Expand Up @@ -258,7 +258,7 @@ set_download_url()
fi

if [ -z "$download_url" ] ; then
download_url="$DOWNLOAD_BASE/bplogagent_${os}_amd64"
download_url="$DOWNLOAD_BASE/observiq_logagent_${os}_amd64"
fi
}

Expand Down
12 changes: 6 additions & 6 deletions scripts/windows-install.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ new-module -name LogAgentInstall -scriptblock {
# Constants
$DEFAULT_WINDOW_TITLE = $host.ui.rawui.WindowTitle
$DEFAULT_INSTALL_PATH = 'C:\'
$DOWNLOAD_BASE = "https://github.com/observiq/bplogagent/releases/latest/download"
$SERVICE_NAME = 'bplogagent'
$DOWNLOAD_BASE = "https://github.com/observiq/observiq-logagent/releases/latest/download"
$SERVICE_NAME = 'observiq-logagent'
$INDENT_WIDTH = ' '
$MIN_DOT_NET_VERSION = '4.5'

Expand Down Expand Up @@ -106,7 +106,7 @@ new-module -name LogAgentInstall -scriptblock {
Show-ColorText '-i, --install_dir'
Add-Indent
Show-ColorText 'Defines the install directory of the agent.' DarkCyan
Show-ColorText 'If not provided, this will default to C:/bplogagent.' DarkCyan
Show-ColorText 'If not provided, this will default to C:/observiq.' DarkCyan
Remove-Indent

Show-ColorText ''
Expand Down Expand Up @@ -286,7 +286,7 @@ new-module -name LogAgentInstall -scriptblock {
Show-ColorText 'Configuring download url...'
Add-Indent
if ( !$script:download_url ) {
$script:download_url = "$DOWNLOAD_BASE/bplogagent_windows_amd64"
$script:download_url = "$DOWNLOAD_BASE/observiq_logagent_windows_amd64"
}
Show-ColorText "Using download url: " '' "$script:download_url" DarkCyan
Remove-Indent
Expand All @@ -297,7 +297,7 @@ new-module -name LogAgentInstall -scriptblock {
function Set-HomeDir {
Show-ColorText 'Setting home directory...'
Add-Indent
$script:agent_home = "{0}bplogagent" -f $script:install_dir
$script:agent_home = "{0}observiq" -f $script:install_dir

If (-Not (Test-Path $script:agent_home) ) {
New-Item -ItemType directory -Path $agent_home | Out-Null
Expand All @@ -312,7 +312,7 @@ new-module -name LogAgentInstall -scriptblock {
Show-ColorText 'Setting binary location...'
Add-Indent

$script:binary_location = Get-AbsolutePath("$script:agent_home\bplogagent.exe")
$script:binary_location = Get-AbsolutePath("$script:agent_home\observiq_logagent.exe")
Show-ColorText "Using binary location: " '' "$script:binary_location" DarkCyan
Remove-Indent
}
Expand Down

0 comments on commit 85b6f56

Please sign in to comment.