Skip to content

Commit

Permalink
Adapting to 0.2.0 (pkgs and Docker images)
Browse files Browse the repository at this point in the history
  • Loading branch information
jgbarah committed Jan 9, 2019
1 parent 5abaee4 commit 3900a34
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 11 deletions.
3 changes: 1 addition & 2 deletions docker/Dockerfile-installed
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@ ADD docker/orgs.json /orgs.json
ADD docker/projects.json /projects.json
ADD docker/identities.yaml /identities.yaml
ADD docker/menu.yaml /menu.yaml
#ADD docker/panels ${DEPLOY_USER_DIR}/panels
RUN /bin/ln -s /menu.yaml ${DEPLOY_USER_DIR}/menu.yaml
ADD docker/aliases.json /aliases.json

USER ${DEPLOY_USER}
WORKDIR ${DEPLOY_USER_DIR}
Expand Down
15 changes: 15 additions & 0 deletions docker/aliases.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"git": {
"raw": ["git-raw"],
"enrich": ["git", "git_author", "git_enrich", "affiliations"]
},
"github": {
"raw": ["github-raw"],
"enrich": ["github_issues", "github_issues_enrich", "issues_closed",
"issues_created", "issues_updated", "affiliations"]
},
"pipermail": {
"raw": ["pipermail-raw"],
"enrich": ["mbox", "affiliations"]
}
}
49 changes: 40 additions & 9 deletions docker/menu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,16 @@
index-patterns:
- panels/json/git-index-pattern.json
- panels/json/git_areas_of_code-index-pattern.json
- panels/json/all_onion-index-pattern.json
- panels/json/demographics-index-pattern.json
menu:
- name: Overview
panel: panels/json/git.json
- name: Attraction/Retention
panel: panels/json/git_demographics.json
- name: Areas of code
panel: panels/json/git_areas_of_code.json
- name: Community Structure Overall
panel: panels/json/onion_overall.json
- name: Community Structure by project
panel: panels/json/onion_projects.json
- name: Community Structure by organization
panel: panels/json/onion_organizations.json
- name: Lifecycle
panel: panels/json/lifecyle.json
- name: Gerrit
source: gerrit
icon: default.png
Expand All @@ -31,6 +27,8 @@
panel: panels/json/gerrit_backlog.json
- name: Timing
panel: panels/json/gerrit_timing.json
- name: Efficiency
panel: panels/json/gerrit_efficiency.json
- name: GitHub PRs
source: github
icon: default.png
Expand All @@ -43,6 +41,8 @@
panel: panels/json/github_pull_requests_backlog.json
- name: Timing
panel: panels/json/github_pull_requests_timing.json
- name: Efficiency
panel: panels/json/github_pull_requests_efficiency.json
- name: GitHub Issues
source: github
icon: default.png
Expand All @@ -55,6 +55,8 @@
panel: panels/json/github_issues_backlog.json
- name: Timing
panel: panels/json/github_issues_timing.json
- name: Efficiency
panel: panels/json/github_issues_efficiency.json
- name: Phabricator
source: phabricator
icon: default.png
Expand Down Expand Up @@ -84,6 +86,7 @@
icon: default.png
index-patterns:
- panels/json/jira-index-pattern.json
- panels/json/jira_resolution_date-index-pattern.json
menu:
- name: Overview
panel: panels/json/jira.json
Expand Down Expand Up @@ -131,6 +134,22 @@
menu:
- name: Overview
panel: panels/json/mediawiki.json
- name: Mailing Lists
source: groupsio
icon: default.png
index-patterns:
- panels/json/mbox-index-pattern.json
menu:
- name: Overview
panel: panels/json/mailinglists.json
- name: Mailing Lists
source: hyperkitty
icon: default.png
index-patterns:
- panels/json/mbox-index-pattern.json
menu:
- name: Overview
panel: panels/json/mailinglists.json
- name: Mailing Lists
source: mbox
icon: default.png
Expand All @@ -139,6 +158,14 @@
menu:
- name: Overview
panel: panels/json/mailinglists.json
- name: Mailing Lists
source: nntp
icon: default.png
index-patterns:
- panels/json/mbox-index-pattern.json
menu:
- name: Overview
panel: panels/json/mailinglists.json
- name: Mailing Lists
source: pipermail
icon: default.png
Expand Down Expand Up @@ -219,11 +246,15 @@
menu:
- name: Overview
panel: panels/json/jenkins.json
- name: Jobs
panel: panels/json/jenkins_jobs.json
- name: Nodes
panel: panels/json/jenkins_nodes.json
- name: Mozilla Club
source: mozillaclub
icon: default.png
index-patterns:
- panels/json/mozillaclub-index-pattern.json
- panels/json/mozilla_club-index-pattern.json
menu:
- name: Events
panel: panels/json/mozilla_club.json
Expand Down Expand Up @@ -257,7 +288,7 @@
- panels/json/google-hits-index-pattern.json
menu:
- name: Overview
panel: panels/json/google_hits.json
panel: panels/json/google-hits.json
- name: DockerHub
source: dockerhub
icon: default.png
Expand Down
4 changes: 4 additions & 0 deletions docker/mordred-infra-ssl.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
[general]
# Directory for logs
logs_dir = /logs
# File with aliases definitions
aliases_file = /aliases.json
# File with menu defintions
menu_file = /menu.yaml

[projects]
projects_file = /projects.json
Expand Down
4 changes: 4 additions & 0 deletions docker/mordred-infra.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
[general]
# Directory for logs
logs_dir = /logs
# File with aliases definitions
aliases_file = /aliases.json
# File with menu defintions
menu_file = /menu.yaml

[projects]
projects_file = /projects.json
Expand Down

0 comments on commit 3900a34

Please sign in to comment.