Skip to content

Commit

Permalink
Merge pull request #22 from f5devcentral/development
Browse files Browse the repository at this point in the history
Update page deploy action with build steps and fix dashboard import bug
  • Loading branch information
clhain authored Oct 11, 2024
2 parents 3705c46 + 57f021a commit 45c164c
Show file tree
Hide file tree
Showing 17 changed files with 513 additions and 493 deletions.
56 changes: 38 additions & 18 deletions .github/workflows/deploy-pages.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,49 @@
name: GitHub Pages
run-name: ${{ github.actor }} is running this workflow
# Sample workflow for building and deploying a Jekyll site to GitHub Pages
name: Deploy Jekyll with GitHub Pages dependencies preinstalled

on:
push:
tags:
- 'v[0-9]+.[0-9]+.[0-9]+'
branches: [main]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
cancel-in-progress: false

jobs:
# Single deploy job no building
deploy:
environment:
name: github-pages
url: ${{steps.deployment.outputs.page_url}}
# Build job
build:
runs-on: ubuntu-latest
permissions:
id-token: write
pages: write
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Pages
uses: actions/configure-pages@v3
- name: Upload Artifact
uses: actions/upload-pages-artifact@v2
uses: actions/configure-pages@v5
- name: Build with Jekyll
uses: actions/jekyll-build-pages@v1
with:
# upload pages directory
path: './pages'
source: ./pages
- name: Upload artifact
uses: actions/upload-pages-artifact@v3

# Deployment job
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
needs: build
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v4
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"description": "",
"gridPos": {
Expand All @@ -93,7 +93,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -149,7 +149,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand All @@ -167,7 +167,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand All @@ -186,7 +186,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand All @@ -205,7 +205,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand All @@ -224,7 +224,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand All @@ -243,7 +243,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand All @@ -262,7 +262,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand Down Expand Up @@ -384,7 +384,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -465,7 +465,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand Down Expand Up @@ -493,7 +493,7 @@
"includeAll": false,
"label": "Prometheus",
"multi": false,
"name": "DS_PROMETHEUS",
"name": "datasource",
"options": [],
"query": "prometheus",
"refresh": 1,
Expand All @@ -505,7 +505,7 @@
"current": {},
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"definition": "label_values(f5_gtm_wideip_enabled_count,job)",
"hide": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"description": "(Average Cycles / Execution) *E(xecutions Last 24 Hours)",
"fieldConfig": {
Expand Down Expand Up @@ -160,7 +160,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"disableTextWrap": false,
"editorMode": "code",
Expand All @@ -181,7 +181,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -264,7 +264,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"disableTextWrap": false,
"editorMode": "code",
Expand All @@ -285,7 +285,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -363,7 +363,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand All @@ -384,7 +384,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -466,7 +466,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand All @@ -486,7 +486,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"description": "",
"fieldConfig": {
Expand Down Expand Up @@ -569,7 +569,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand All @@ -589,7 +589,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"description": "",
"fieldConfig": {
Expand Down Expand Up @@ -672,7 +672,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand Down Expand Up @@ -705,7 +705,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -754,7 +754,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand All @@ -775,7 +775,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -824,7 +824,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand All @@ -845,7 +845,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -894,7 +894,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand Down Expand Up @@ -923,7 +923,7 @@
"includeAll": false,
"label": "Prometheus",
"multi": false,
"name": "DS_PROMETHEUS",
"name": "datasource",
"options": [],
"query": "prometheus",
"refresh": 1,
Expand All @@ -935,7 +935,7 @@
"current": {},
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"definition": "label_values(f5_system_state_up_ratio,job)",
"hide": 0,
Expand All @@ -958,7 +958,7 @@
"current": {},
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
"uid": "${datasource}"
},
"definition": "label_values(f5_rule_executions_total{job=\"$device_name\"},f5_rule_name)",
"hide": 0,
Expand Down
Loading

0 comments on commit 45c164c

Please sign in to comment.