Skip to content
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

Updates implemented during deployment #1

Open
wants to merge 39 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
cb2f8cb
Updates implemented during deployment
mikemonkers Dec 17, 2020
4454b2a
Enable set -eu and fix the resulting undefined variable issues
mikemonkers Dec 18, 2020
e31c2c9
Enable set -eu and fix the resulting undefined variable issues
mikemonkers Dec 18, 2020
f1d80b9
Enable set -eu and fix the resulting undefined variable issues
mikemonkers Dec 18, 2020
dbdd2df
Add .gitignore
mikemonkers Dec 21, 2020
7fd11b8
Change to use GraphQL APIs
mikemonkers Dec 21, 2020
b372cd9
Typo
mikemonkers Dec 21, 2020
e84d1ee
Increase overlaps
mikemonkers Dec 21, 2020
4370d70
typo
mikemonkers Dec 21, 2020
4834902
typo
mikemonkers Dec 21, 2020
aaad992
Remove redundant param
mikemonkers Dec 22, 2020
d9b99f7
Remove redundant param
mikemonkers Dec 22, 2020
b6d487f
Remove redundant param
mikemonkers Dec 22, 2020
dd5e187
typo
mikemonkers Dec 22, 2020
78fc463
Tidy up tmp file management.
mikemonkers Dec 22, 2020
c136fc3
Add example .env
mikemonkers Dec 22, 2020
df8c7c9
Make the TMP_DIR overridable with .env
mikemonkers Dec 22, 2020
bf7b659
Add example .env
mikemonkers Dec 22, 2020
57a52e6
Update Overiew Dash and add Firewall Dash
mikemonkers Dec 23, 2020
abef2d1
Update Overiew Dash and add Firewall Dash
mikemonkers Dec 23, 2020
698aa96
Add lint and promote github workflow
mikemonkers Dec 23, 2020
5e41ec8
No change, change to trigger workflow
mikemonkers Dec 23, 2020
0b431df
Add grafana tag
mikemonkers Dec 23, 2020
42c4642
Merge pull request #1 from MasterOfMalt/PLOPS-253_graphql_api
mikemonkers Dec 23, 2020
2e0c39b
Update README.md
mikemonkers Dec 23, 2020
14a6522
Fix workflow
mikemonkers Dec 23, 2020
79847e6
Shell Check errors
mikemonkers Dec 23, 2020
1ffd142
Shell Check errors
mikemonkers Dec 23, 2020
d447328
Shell Check errors
mikemonkers Dec 23, 2020
1a105e1
Shell Check errors
mikemonkers Dec 23, 2020
7e9c8ef
Merge pull request #4 from MasterOfMalt/PLOPS-253_fix_workflow
mikemonkers Dec 23, 2020
6345b5c
Update lint_test_promote.yml
mikemonkers Dec 23, 2020
c3a8afa
Merge devel into master
github-actions[bot] Dec 23, 2020
cb1cdd2
Prevent parallel runs on same zone
mikemonkers Jan 19, 2021
f3c10b4
Some minor efficiencies, maybe?
mikemonkers Jan 20, 2021
752efd0
Vagrant file for testing
mikemonkers Jan 20, 2021
72d727b
Improve the influx posting to bundle
mikemonkers Jan 20, 2021
f372c3c
Merge pull request #5 from MasterOfMalt/PLOPS-142_limit_running
mikemonkers Jan 20, 2021
afcffd2
Merge devel into master
github-actions[bot] Jan 20, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .env_example
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/bin/bash
#set -eu
#set -x

##################################################################
# NOTE: copy this file to ".env" and fill out.
##################################################################

##################################################################
# Used for debugging the script. Comment out when running in real env.
export ECHO=echo
export TMP_DIR="."

##################################################################
# Cloudflare Env Vars
#
export CLOUDFLARE_API_TOKEN='<your api token>'

# specify Account ID, Zone ID and Zone Name
export CLOUDFLARE_ACCOUNT_ID='<account id>'
export CLOUDFLARE_ZONE_ID='<zone id>'
export CLOUDFLARE_ZONE_NAME='<zone_name>'

##################################################################
# Influxdb Env Vars
export INFLUXDB_URL="http://localhost"
48 changes: 48 additions & 0 deletions .github/workflows/lint_test_promote.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# This is a basic workflow to help you get started with Actions

name: Lint, Test and Promote

# Controls when the action will run. Triggers the workflow on push
# events but only for the main branch or pull request
on:
push:
branches:
- master
- devel
pull_request:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
shell_lint:
runs-on: ubuntu-latest
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

# replace "master" with any valid ref
- name: Run Shellcheck
uses: azohra/shell-linter@latest
with:
severity: "error"

promote:
if: github.ref == 'refs/heads/devel'
runs-on: ubuntu-latest
needs: [shell_lint]
steps:
- uses: actions/checkout@v2
# TODO: Break out into common bits - perhaps even the "uses" type system.
- name: Merge to master
uses: devmasx/[email protected]
with:
type: now
from_branch: devel
target_branch: master
github_token: ${{ github.token }}

- name: Bump version and push tag
uses: mathieudutour/[email protected]
with:
release_branches: devel
tag_prefix: ''
github_token: ${{ secrets.GITHUB_TOKEN }}
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Environments
.env

# IDE's
.vscode/*
.idea/*
Loading