-
Notifications
You must be signed in to change notification settings - Fork 61
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
[WIP] Added the dashboard installer script with Keystone. Updated the Makefile to create a installer dist #676
Open
anvithks
wants to merge
9
commits into
sodafoundation:master
Choose a base branch
from
anvithks:soda-experience-installer
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 7 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
75f97b5
Added the dashboard installer script with Keystone. Updated the Makef…
anvithks c3f4bee
Updated as per review comments. changed the variable name and updated…
anvithks 349c5f4
Added installer for the SRM toolchain. Updated the readme and added t…
anvithks 1a0771b
Updated the install, readme and Makefile
anvithks 1dfa4c8
Updated the Makefile. Fixed incorrect version
anvithks 2a099ce
Updated the readme. Added prerequisite of root
anvithks 0f36b23
Updated the license info
anvithks d07f1e6
Updated as per review comments. Made path configurable, changed dir s…
anvithks dfc7af0
Updated as per review comments. Added FIXME
anvithks 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 |
---|---|---|
|
@@ -14,25 +14,43 @@ | |
|
||
IMAGE = sodafoundation/dashboard | ||
VERSION := latest | ||
BASE_DIR := $(shell pwd) | ||
BUILD_DIR := $(BASE_DIR)/build | ||
DIST_DIR := $(BASE_DIR)/build/dist | ||
BUILD_TGT := soda-dashboard-$(VERSION) | ||
|
||
|
||
.PHONY: all build dashboard docker clean | ||
|
||
all:build | ||
.PHONY: all | ||
|
||
build:dashboard | ||
.PHONY: build | ||
build:dist docker | ||
|
||
dashboard: | ||
chmod +x ./image_builder.sh \ | ||
&& ./image_builder.sh | ||
.PHONY: dashboard | ||
|
||
docker: dashboard | ||
docker build . -t $(IMAGE):$(VERSION) | ||
.PHONY: docker | ||
|
||
clean: | ||
sudo rm -Rf ./build | ||
service nginx stop | ||
sudo rm -rf /etc/nginx/sites-available/default /var/www/html/* ./dist warn=False | ||
npm uninstall --unsafe-perm | ||
npm uninstall --unsafe-perm -g @angular/[email protected] | ||
.PHONY: clean | ||
|
||
version: | ||
@echo ${VERSION} | ||
|
||
.PHONY: dist | ||
dist: | ||
rm -fr $(DIST_DIR) && mkdir -p $(DIST_DIR)/$(BUILD_TGT)/ | ||
cd $(DIST_DIR) && \ | ||
cp ../../install/install.sh $(BUILD_TGT)/ && \ | ||
cp ../../install/ministone.py $(BUILD_TGT)/ && \ | ||
cp -R ../../install/conf $(BUILD_TGT)/ && \ | ||
cp $(BASE_DIR)/LICENSE.md $(BUILD_TGT) && \ | ||
zip -r $(DIST_DIR)/$(BUILD_TGT).zip $(BUILD_TGT) && \ | ||
tar zcvf $(DIST_DIR)/$(BUILD_TGT).tar.gz $(BUILD_TGT) | ||
tree $(DIST_DIR) |
Large diffs are not rendered by default.
Oops, something went wrong.
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 |
---|---|---|
@@ -0,0 +1,70 @@ | ||
{ | ||
"admin_or_owner": "is_admin:True or (role:admin and is_admin_project:True) or tenant_id:%(tenant_id)s", | ||
"default": "rule:admin_or_owner", | ||
"admin_api": "is_admin:True or (role:admin and is_admin_project:True)", | ||
|
||
|
||
"profile:create":"rule:admin_api", | ||
"profile:list":"", | ||
"profile:get":"", | ||
"profile:update":"rule:admin_api", | ||
"profile:delete":"rule:admin_api", | ||
"profile:add_custom_property": "rule:admin_api", | ||
"profile:list_custom_properties": "", | ||
"profile:remove_custom_property": "rule:admin_api", | ||
"volume:create": "rule:admin_or_owner", | ||
"volume:list": "rule:admin_or_owner", | ||
"volume:get": "rule:admin_or_owner", | ||
"volume:update": "rule:admin_or_owner", | ||
"volume:extend": "rule:admin_or_owner", | ||
"volume:delete": "rule:admin_or_owner", | ||
"volume:create_attachment": "rule:admin_or_owner", | ||
"volume:list_attachments": "rule:admin_or_owner", | ||
"volume:get_attachment": "rule:admin_or_owner", | ||
"volume:update_attachment": "rule:admin_or_owner", | ||
"volume:delete_attachment": "rule:admin_or_owner", | ||
"snapshot:create": "rule:admin_or_owner", | ||
"snapshot:list": "rule:admin_or_owner", | ||
"snapshot:get": "rule:admin_or_owner", | ||
"snapshot:update": "rule:admin_or_owner", | ||
"snapshot:delete": "rule:admin_or_owner", | ||
"dock:list": "rule:admin_api", | ||
"dock:get": "rule:admin_api", | ||
"pool:list": "rule:admin_api", | ||
"pool:get": "rule:admin_api", | ||
"replication:create": "rule:admin_or_owner", | ||
"replication:list": "rule:admin_or_owner", | ||
"replication:list_detail": "rule:admin_or_owner", | ||
"replication:get": "rule:admin_or_owner", | ||
"replication:update": "rule:admin_or_owner", | ||
"replication:delete": "rule:admin_or_owner", | ||
"replication:enable": "rule:admin_or_owner", | ||
"replication:disable": "rule:admin_or_owner", | ||
"replication:failover": "rule:admin_or_owner", | ||
"volume_group:create": "rule:admin_or_owner", | ||
"volume_group:list": "rule:admin_or_owner", | ||
"volume_group:get": "rule:admin_or_owner", | ||
"volume_group:update": "rule:admin_or_owner", | ||
"volume_group:delete": "rule:admin_or_owner", | ||
"availability_zone:list":"", | ||
"metrics:get": "rule:admin_or_owner", | ||
"metrics:collect": "rule:admin_or_owner", | ||
"metrics:uploadconf": "rule:admin_api", | ||
"metrics:downloadconf": "rule:admin_api", | ||
"metrics:urls": "rule:admin_or_owner", | ||
"fileshare:create": "rule:admin_or_owner", | ||
"fileshare:delete": "rule:admin_or_owner", | ||
"fileshare:list": "rule:admin_or_owner", | ||
"fileshare:get": "rule:admin_or_owner", | ||
"fileshare:update": "rule:admin_or_owner", | ||
"fileshareacl:create": "rule:admin_or_owner", | ||
"fileshareacl:delete": "rule:admin_or_owner", | ||
"fileshareacl:list": "rule:admin_or_owner", | ||
"fileshareacl:get": "rule:admin_or_owner", | ||
"fileshareacl:update": "rule:admin_or_owner", | ||
"host:create": "rule:admin_or_owner", | ||
"host:delete": "rule:admin_or_owner", | ||
"host:list": "rule:admin_or_owner", | ||
"host:get": "rule:admin_or_owner", | ||
"host:update": "rule:admin_or_owner" | ||
} |
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 |
---|---|---|
@@ -0,0 +1,6 @@ | ||
route: | ||
receiver: 'delfin' | ||
group_by: [severity] | ||
|
||
receivers: | ||
- name: 'delfin' |
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 |
---|---|---|
@@ -0,0 +1,7 @@ | ||
GF_USERS_DEFAULT_THEME=light | ||
GF_AUTH_DISABLE_LOGIN_FORM=true | ||
GF_AUTH_ANONYMOUS_ENABLED=true | ||
GF_AUTH_ANONYMOUS_ORG_ROLE=Admin | ||
GF_SECURITY_ALLOW_EMBEDDING=true | ||
|
||
|
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 |
---|---|---|
@@ -0,0 +1,56 @@ | ||
version: '3.1' | ||
|
||
volumes: | ||
prometheus_data: {} | ||
grafana_data: {} | ||
|
||
services: | ||
prometheus: | ||
image: prom/prometheus: { prometheus_docker_version } | ||
container_name: monitoring_prometheus | ||
volumes: | ||
- ./prometheus/:/etc/prometheus/ | ||
- prometheus_data:/prometheus | ||
- ./prometheus/alerts.rules:/alertmanager/alerts.rules | ||
command: | ||
- '--config.file=/etc/prometheus/prometheus.yml' | ||
- '--storage.tsdb.path=/prometheus' | ||
ports: | ||
- SODA_PROMETHEUS_PORT:SODA_PROMETHEUS_PORT | ||
links: | ||
- alertmanager:alertmanager | ||
restart: always | ||
deploy: | ||
mode: global | ||
environment: | ||
- HOST_IP="HOST_IP" | ||
|
||
alertmanager: | ||
image: prom/alertmanager: { alertmanager_docker_version } | ||
container_name: monitoring_alertmanager | ||
ports: | ||
- SODA_ALERTMANAGER_PORT:SODA_ALERTMANAGER_PORT | ||
volumes: | ||
- ./alertmanager/:/etc/alertmanager/ | ||
restart: always | ||
command: | ||
- '--config.file=/etc/alertmanager/config.yml' | ||
- '--storage.path=/alertmanager' | ||
deploy: | ||
mode: global | ||
|
||
grafana: | ||
image: grafana/grafana: { grafana_docker_version } | ||
container_name: monitoring_grafana | ||
depends_on: | ||
- prometheus | ||
ports: | ||
- SODA_GRAFANA_PORT:SODA_GRAFANA_PORT | ||
volumes: | ||
- grafana_data:/var/lib/grafana | ||
- ./grafana/dashboards:/var/lib/grafana/dashboards | ||
- ./grafana/provisioning:/etc/grafana/provisioning | ||
restart: always | ||
env_file: | ||
- config.grafana | ||
|
Oops, something went wrong.
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 dont we keep the project specific configuration files with separate folders? Same for related files below as well.
like ....dashboard/install/conf/delfin/.......
.......conf/strato/....
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.
This is done.
currently the structure is changed to