Skip to content

Commit

Permalink
Cleanups after merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
guydavis committed Feb 16, 2024
1 parent af57d15 commit cee3d7d
Show file tree
Hide file tree
Showing 6 changed files with 98 additions and 5 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ All notable changes to this project will be documented in this file. The format

## [Unreleased]
### Added
- Optionally launch Chia Data Layer services (https://docs.chia.net/guides/datalayer-user-guide/) if env var `chia_data=true` is set.
- Support for Achi blockchain. Requires its own plots (like Chives), you'll have to plot separately if interested. Thanks @priyankub
- Optionally launch Chia Data Layer services (https://docs.chia.net/guides/datalayer-user-guide/) if env var `chia_data=true` is set.
### Changed
- Harvester mode will now optionally also run chia-exporter for Prometheus results.
### Updated
Expand Down
1 change: 1 addition & 0 deletions CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ A big thanks to all that contributed with dev and test including:
* @ToTo
* @Finball
* @chris-merritt
* @priyankub

## Trademark Notice
CHIA NETWORK INC, CHIA™, the CHIA BLOCKCHAIN™, the CHIA PROTOCOL™, CHIALISP™ and the “leaf Logo” (including the leaf logo alone when it refers to or indicates Chia), are trademarks or registered trademarks of Chia Network, Inc., a Delaware corporation. *There is no affliation between this Machinaris project and the main Chia Network project.*
91 changes: 91 additions & 0 deletions config/chiadog/achi.sample.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
# This is useful to differentiate multiple
# instances monitoring multiple harvesters
notification_title_prefix: '$HOSTNAME-achi'
log_level: INFO
coin_name: 'achi'
coin_symbol: 'achi'

# Only one consumer can be enabled at a time, you can
# delete the section for the consumer which you aren't using
# DON'T CHANGE file_path IT'S ALREADY SET IN-CONTAINER FOR MACHINARIS!
chia_logs:
file_log_consumer:
enable: true
prefix: 'achi'
file_path: '~/.chia/achi/mainnet/log/debug.log'

# Enable this and chiadog will ping a remote server every 5 minutes
# That way you can know that the monitoring is running as expected
#keep_alive_monitor:
# enable_remote_ping: false
# ping_url: ''

# Enable this and you'll receive a daily summary notification
# on your farm performance at the specified time of the day.
daily_stats:
enable: true
time_of_day: 21

# We support a lot of notifiers, please check the README for more
# information. You can delete the sections which you aren't using.
# You can also enable more than one notifier and send different
# notifications to each of them. E.g. enable daily_stats only to E-mail.
# If you enable wallet_events you'll get notifications anytime your
# wallet receives some XCH (e.g. farming reward).
notifier:
pushover:
enable: false
daily_stats: true
wallet_events: true
credentials:
api_token: 'dummy_token'
user_key: 'dummy_key'
telegram:
enable: false
daily_stats: true
wallet_events: true
credentials:
bot_token: 'dummy_bot_token'
chat_id: 'dummy_chat_id'
smtp:
enable: false
daily_stats: true
wallet_events: true
credentials:
sender: '[email protected]'
sender_name: 'Machinaris'
recipient: '[email protected]'
username_smtp: 'username'
password_smtp: 'password'
host: 'smtp.example.com'
port: 587
script:
# DON'T CHANGE THIS SCRIPT NOTIFIER, IT'S USED BY MACHINARIS!
enable: true
daily_stats: true
wallet_events: true
script_path: '/root/.chia/chiadog/notifier.sh'
discord:
enable: false
daily_stats: true
wallet_events: true
credentials:
webhook_url: 'https://discord.com/api/webhooks/...'
slack:
enable: false
daily_stats: true
wallet_events: true
credentials:
webhook_url: 'https://hooks.slack.com/services/...'
mqtt:
enable: false
daily_stats: true
wallet_events: true
topic: achi/achidog/alert
qos: 1
retain: false
credentials:
host: '192.168.0.10'
port: 8883
username: ''
password: ''
4 changes: 2 additions & 2 deletions scripts/chiadog_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ CHIADOG_BRANCH=$1

if [[ (${mode} =~ ^fullnode.* || ${mode} =~ "harvester") && ${blockchains} != 'mmx' ]]; then
if [[ ! -f /chiadog/main.py ]]; then
echo 'Installing Chiadog from https://github.com/priyankub/chiadog using branch: ${CHIADOG_BRANCH}'
echo 'Installing Chiadog from https://github.com/guydavis/chiadog using branch: ${CHIADOG_BRANCH}'
cd /
git clone --branch ${CHIADOG_BRANCH} https://github.com/priyankub/chiadog.git
git clone --branch ${CHIADOG_BRANCH} https://github.com/guydavis/chiadog.git
cd /chia-blockchain/
venv/bin/pip3 install -r /chiadog/requirements.txt
fi
Expand Down
2 changes: 1 addition & 1 deletion scripts/forks/achi_install.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/env bash
#
# Installs Achi as per https://achicoin.org/achipedia/post-1/
# Installs Achi as per https://github.com/Achi-Coin/achi-blockchain
#

ACHI_BRANCH=$1
Expand Down
2 changes: 1 addition & 1 deletion scripts/forks/greenbtc_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#

GREENBTC_BRANCH=$1
# On 2023-01-02
# On 2024-02-16
HASH=200816a51c24375fadcbcd25a0b1cb7549f61c77

if [ -z ${GREENBTC_BRANCH} ]; then
Expand Down

0 comments on commit cee3d7d

Please sign in to comment.