-
Notifications
You must be signed in to change notification settings - Fork 6
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.
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
Added sla-dashboard as custom entity #8
Open
rosogon
wants to merge
2
commits into
SeaCloudsEU:master
Choose a base branch
from
rosogon:feature/sla-dashboard
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -55,9 +55,35 @@ services: | |
DB_PASSWORD: "_atossla_" | ||
war: https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=eu.seaclouds-project&a=sla-service&v=LATEST&e=war | ||
|
||
|
||
- serviceType: brooklyn.entity.database.mysql.MySqlNode | ||
id: sla-db | ||
name: SLA Db | ||
brooklyn.config: | ||
creationScriptUrl: https://raw.githubusercontent.com/SeaCloudsEU/sla-core/e1d3bd4dec27236cfdefa1eae81d38db3dcd11da/sla-repository/src/main/resources/sql/01database.sql | ||
|
||
- serviceType: brooklyn.entity.basic.VanillaSoftwareProcess | ||
name: SLA Dashboard | ||
id: sla-dashboard | ||
launch.command: | | ||
# Listen socket | ||
export SOCKET=0.0.0.0:8000 | ||
# install necessary packages | ||
sudo apt-get -y install python-pip | ||
sudo apt-get -y install git | ||
sudo pip install virtualenv | ||
# setup application environment | ||
export VIRTUALENVS_DIR=$HOME/virtualenvs | ||
rm -Rf $VIRTUALENVS_DIR/sla-dashboard | ||
# install application | ||
test -f README.md || git clone https://github.com/SeaCloudsEU/sla-dashboard . | ||
virtualenv $VIRTUALENVS_DIR/sla-dashboard | ||
. $VIRTUALENVS_DIR/sla-dashboard/bin/activate | ||
pip install -r requirements.txt | ||
./manage.py syncdb --noinput | ||
# run application | ||
./manage.py runserver $SOCKET & | ||
sleep 5 # manage.py spawns; we must wait a little | ||
netstat -tpln | grep "$SOCKET" | awk -F' *|/' '{print $7}' > $PID_FILE | ||
env: | ||
SLA_MANAGER_URL: $brooklyn:formatString("http://%s:%s", component("sla-core").attributeWhenReady("host.address"), component("sla-core").attributeWhenReady("http.port")) | ||
DEBUG: False | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. are you using this env var? if not, let's remove it |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why are you waiting for this URL if you are not using it?
maybe better to use something like
launch.latch: $brooklyn:component("sla-core").attributeWhenReady("service.isUp")
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What url? SLA_MANAGER_URL? I do use it. But sth strange happens, because brooklyn tries to reassign it each minute.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you mean
SLA_MANAGER_URL
is expected by your python app, even if not passed explicitly tomanage.py runserver
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
SLA_MANAGER_URL points to slacore endpoint, and has a default value of http://localhost:8080/sla-service (suitable for developing purposes), and overridable with an env var (https://github.com/SeaCloudsEU/sla-dashboard/blob/d06337aea0684a0773f1b3397304b8246188d977/sladashboard/settings.py#L97).