Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 32682283da | |||
| 8775b02970 | |||
| 38ea7f7839 | |||
| cb0aa9823e |
@@ -0,0 +1,35 @@
|
|||||||
|
# compiles angular frontend and attaches it to the latest release.
|
||||||
|
name: Release Frontend
|
||||||
|
|
||||||
|
on:
|
||||||
|
release:
|
||||||
|
# Only use the types keyword to narrow down the activity types that will trigger your workflow.
|
||||||
|
types: [published]
|
||||||
|
jobs:
|
||||||
|
release-frontend:
|
||||||
|
name: Release Frontend
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
container: node:lts-slim
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
with:
|
||||||
|
ref: ${{github.event.release.tag_name}}
|
||||||
|
- name: Build Frontend
|
||||||
|
run: |
|
||||||
|
cd webapp/frontend
|
||||||
|
npm install -g @angular/cli@9.1.4
|
||||||
|
npm install
|
||||||
|
mkdir -p dist
|
||||||
|
ng build --output-path=dist --deploy-url="/web/" --base-href="/web/" --prod
|
||||||
|
tar -czf scrutiny-web-frontend.tar.gz dist
|
||||||
|
- name: Upload Frontend Asset
|
||||||
|
id: upload-release-asset3
|
||||||
|
uses: actions/upload-release-asset@v1
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.SCRUTINY_GITHUB_TOKEN }}
|
||||||
|
with:
|
||||||
|
upload_url: ${{ github.event.release.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
|
||||||
|
asset_path: scrutiny-web-frontend.tar.gz
|
||||||
|
asset_name: scrutiny-web-frontend.tar.gz
|
||||||
|
asset_content_type: application/octet-stream
|
||||||
@@ -68,7 +68,7 @@ analogj/scrutiny
|
|||||||
|
|
||||||
- `/run/udev` is necessary to provide the Scrutiny collector with access to your device metadata
|
- `/run/udev` is necessary to provide the Scrutiny collector with access to your device metadata
|
||||||
- `--cap-add SYS_RAWIO` is necessary to allow `smartctl` permission to query your device SMART data
|
- `--cap-add SYS_RAWIO` is necessary to allow `smartctl` permission to query your device SMART data
|
||||||
- NOTE: If you have NVMe drives, you must use `--cap-add SYS_ADMIN` instead. See [#26](https://github.com/AnalogJ/scrutiny/issues/26)
|
- NOTE: If you have NVMe drives, you must use `--cap-add SYS_ADMIN` instead. See issue [#26](https://github.com/AnalogJ/scrutiny/issues/26#issuecomment-696817130)
|
||||||
- `--device` entries are required to ensure that your hard disk devices are accessible within the container
|
- `--device` entries are required to ensure that your hard disk devices are accessible within the container
|
||||||
- `analogj/scrutiny` is a omnibus image, containing both the webapp server (frontend & api) as well as the S.M.A.R.T metric collector. (see below)
|
- `analogj/scrutiny` is a omnibus image, containing both the webapp server (frontend & api) as well as the S.M.A.R.T metric collector. (see below)
|
||||||
|
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ func (mc *MetricsCollector) Collect(deviceWWN string, deviceName string, deviceT
|
|||||||
//defer wg.Done()
|
//defer wg.Done()
|
||||||
mc.logger.Infof("Collecting smartctl results for %s\n", deviceName)
|
mc.logger.Infof("Collecting smartctl results for %s\n", deviceName)
|
||||||
|
|
||||||
args := []string{"-a", "-j"}
|
args := []string{"-x", "-j"}
|
||||||
//only include the device type if its a non-standard one. In some cases ata drives are detected as scsi in docker, and metadata is lost.
|
//only include the device type if its a non-standard one. In some cases ata drives are detected as scsi in docker, and metadata is lost.
|
||||||
if len(deviceType) > 0 && deviceType != "scsi" && deviceType != "ata" {
|
if len(deviceType) > 0 && deviceType != "scsi" && deviceType != "ata" {
|
||||||
args = append(args, "-d", deviceType)
|
args = append(args, "-d", deviceType)
|
||||||
|
|||||||
@@ -2,4 +2,4 @@ package version
|
|||||||
|
|
||||||
// VERSION is the app-global version string, which will be replaced with a
|
// VERSION is the app-global version string, which will be replaced with a
|
||||||
// new value during packaging
|
// new value during packaging
|
||||||
const VERSION = "0.2.1"
|
const VERSION = "0.2.2"
|
||||||
|
|||||||
Reference in New Issue
Block a user