mirror of
				https://github.com/ClusterCockpit/cc-metric-collector.git
				synced 2025-11-04 02:35:07 +01:00 
			
		
		
		
	Fix Github Actions (#18)
* Fix config for Github Actions * Fix paths * Add CentOS Latest and AlmaLinux 8.5 to RPM action * Fix ID * Reduce min Go version to 1.16 and use time.Unix in gpfsMetric
This commit is contained in:
		
							
								
								
									
										6
									
								
								.github/ci-collectors.json
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								.github/ci-collectors.json
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@@ -0,0 +1,6 @@
 | 
			
		||||
{
 | 
			
		||||
    "tempstat": {},
 | 
			
		||||
    "diskstat": {},
 | 
			
		||||
    "memstat": {},
 | 
			
		||||
    "cpustat": {}
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										58
									
								
								.github/ci-config.json
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										58
									
								
								.github/ci-config.json
									
									
									
									
										vendored
									
									
								
							@@ -1,52 +1,8 @@
 | 
			
		||||
{
 | 
			
		||||
  "sink": {
 | 
			
		||||
    "user": "testuser",
 | 
			
		||||
    "password": "testpass",
 | 
			
		||||
    "host": "127.0.0.1",
 | 
			
		||||
    "port": "9090",
 | 
			
		||||
    "database": "testdb",
 | 
			
		||||
    "organization": "testorg",
 | 
			
		||||
    "type": "stdout"
 | 
			
		||||
  },
 | 
			
		||||
  "interval": 3,
 | 
			
		||||
  "duration": 1,
 | 
			
		||||
  "collectors": [
 | 
			
		||||
    "tempstat",
 | 
			
		||||
    "loadavg",
 | 
			
		||||
    "memstat",
 | 
			
		||||
    "netstat",
 | 
			
		||||
    "ibstat",
 | 
			
		||||
    "lustrestat",
 | 
			
		||||
    "cpustat",
 | 
			
		||||
    "topprocs",
 | 
			
		||||
    "nvidia",
 | 
			
		||||
    "diskstat",
 | 
			
		||||
    "ipmistat",
 | 
			
		||||
    "gpfs",
 | 
			
		||||
    "cpufreq",
 | 
			
		||||
    "cpufreq_cpuinfo"
 | 
			
		||||
  ],
 | 
			
		||||
  "default_tags": {
 | 
			
		||||
    "cluster": "testcluster"
 | 
			
		||||
  },
 | 
			
		||||
  "receiver": {
 | 
			
		||||
    "type": "none"
 | 
			
		||||
  },
 | 
			
		||||
  "collect_config": {
 | 
			
		||||
    "topprocs": {
 | 
			
		||||
      "num_procs": 2
 | 
			
		||||
    },
 | 
			
		||||
    "tempstat": {
 | 
			
		||||
      "tag_override": {
 | 
			
		||||
        "hwmon0": {
 | 
			
		||||
          "type": "socket",
 | 
			
		||||
          "type-id": "0"
 | 
			
		||||
        },
 | 
			
		||||
        "hwmon1": {
 | 
			
		||||
          "type": "socket",
 | 
			
		||||
          "type-id": "1"
 | 
			
		||||
        }
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
  "sinks": ".github/ci-sinks.json",
 | 
			
		||||
  "collectors" : ".github/ci-collectors.json",
 | 
			
		||||
  "receivers" : ".github/ci-receivers.json",
 | 
			
		||||
  "router" : ".github/ci-router.json",
 | 
			
		||||
  "interval": 5,
 | 
			
		||||
  "duration": 1
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										1
									
								
								.github/ci-receivers.json
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								.github/ci-receivers.json
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@@ -0,0 +1 @@
 | 
			
		||||
[]
 | 
			
		||||
							
								
								
									
										22
									
								
								.github/ci-router.json
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										22
									
								
								.github/ci-router.json
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@@ -0,0 +1,22 @@
 | 
			
		||||
{
 | 
			
		||||
    "add_tags" : [
 | 
			
		||||
        {
 | 
			
		||||
            "key" : "cluster",
 | 
			
		||||
            "value" : "testcluster",
 | 
			
		||||
            "if" : "*"
 | 
			
		||||
        },
 | 
			
		||||
        {
 | 
			
		||||
            "key" : "test",
 | 
			
		||||
            "value" : "testing",
 | 
			
		||||
            "if" : "name == 'temp_package_id_0'"
 | 
			
		||||
        }
 | 
			
		||||
    ],
 | 
			
		||||
    "delete_tags" : [
 | 
			
		||||
        {
 | 
			
		||||
            "key" : "unit",
 | 
			
		||||
            "value" : "*",
 | 
			
		||||
            "if" : "*"
 | 
			
		||||
        }
 | 
			
		||||
    ],
 | 
			
		||||
    "interval_timestamp" : true
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										6
									
								
								.github/ci-sinks.json
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								.github/ci-sinks.json
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@@ -0,0 +1,6 @@
 | 
			
		||||
[
 | 
			
		||||
  {
 | 
			
		||||
    "type" : "stdout",
 | 
			
		||||
    "meta_as_tags" : true
 | 
			
		||||
  }
 | 
			
		||||
]
 | 
			
		||||
							
								
								
									
										40
									
								
								.github/workflows/rpmbuild.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										40
									
								
								.github/workflows/rpmbuild.yml
									
									
									
									
										vendored
									
									
								
							@@ -2,7 +2,7 @@ name: Run RPM Build
 | 
			
		||||
on: push
 | 
			
		||||
 | 
			
		||||
jobs:
 | 
			
		||||
  build:
 | 
			
		||||
  build-centos8:
 | 
			
		||||
    runs-on: ubuntu-latest
 | 
			
		||||
    steps:
 | 
			
		||||
    - uses: actions/checkout@v2
 | 
			
		||||
@@ -21,3 +21,41 @@ jobs:
 | 
			
		||||
      with:
 | 
			
		||||
        name: cc-metric-collector SRPM CentOS8
 | 
			
		||||
        path: ${{ steps.rpm.outputs.source_rpm_path }}
 | 
			
		||||
  build-centos-latest:
 | 
			
		||||
    runs-on: ubuntu-latest
 | 
			
		||||
    steps:
 | 
			
		||||
    - uses: actions/checkout@v2
 | 
			
		||||
    - uses: TomTheBear/rpmbuild@centos_latest
 | 
			
		||||
      id: rpm
 | 
			
		||||
      name: Build RPM package on CentOS 'Latest'
 | 
			
		||||
      with:
 | 
			
		||||
        spec_file: "./scripts/cc-metric-collector.spec"
 | 
			
		||||
    - name: Save RPM as artifact
 | 
			
		||||
      uses: actions/upload-artifact@v1.0.0
 | 
			
		||||
      with:
 | 
			
		||||
        name: cc-metric-collector RPM CentOS 'Latest'
 | 
			
		||||
        path: ${{ steps.rpm.outputs.rpm_dir_path }}
 | 
			
		||||
    - name: Save SRPM as artifact
 | 
			
		||||
      uses: actions/upload-artifact@v1.0.0
 | 
			
		||||
      with:
 | 
			
		||||
        name: cc-metric-collector SRPM CentOS 'Latest'
 | 
			
		||||
        path: ${{ steps.rpm.outputs.source_rpm_path }}
 | 
			
		||||
  build-alma-8_5:
 | 
			
		||||
    runs-on: ubuntu-latest
 | 
			
		||||
    steps:
 | 
			
		||||
    - uses: actions/checkout@v2
 | 
			
		||||
    - uses: TomTheBear/rpmbuild@alma8.5
 | 
			
		||||
      id: rpm
 | 
			
		||||
      name: Build RPM package on AlmaLinux 8.5
 | 
			
		||||
      with:
 | 
			
		||||
        spec_file: "./scripts/cc-metric-collector.spec"
 | 
			
		||||
    - name: Save RPM as artifact
 | 
			
		||||
      uses: actions/upload-artifact@v1.0.0
 | 
			
		||||
      with:
 | 
			
		||||
        name: cc-metric-collector RPM AlmaLinux 8.5
 | 
			
		||||
        path: ${{ steps.rpm.outputs.rpm_dir_path }}
 | 
			
		||||
    - name: Save SRPM as artifact
 | 
			
		||||
      uses: actions/upload-artifact@v1.0.0
 | 
			
		||||
      with:
 | 
			
		||||
        name: cc-metric-collector SRPM AlmaLinux 8.5
 | 
			
		||||
        path: ${{ steps.rpm.outputs.source_rpm_path }}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user