mirror of
				https://github.com/ClusterCockpit/cc-metric-collector.git
				synced 2025-11-04 10:45:06 +01:00 
			
		
		
		
	Merge latest commits from develop to main branch (#114)
				
					
				
			* Add cpu_used (all-cpu_idle) to CpustatCollector * Update cc-metric-collector.init * Allow selection of timestamp precision in HttpSink * Add comment about precision requirement for cc-metric-store * Fix for API changes in gofish@v0.15.0 * Update requirements to latest version * Read sensors through redfish * Update golang toolchain to 1.21 * Remove stray error check * Update main config in configuration.md * Update Release action to use golang 1.22 stable release, no golang RPMs anymore * Update runonce action to use golang 1.22 stable release, no golang RPMs anymore * Update README.md Use right JSON type in configuration * Update sink's README * Test whether ipmitool or ipmi-sensors can be executed without errors --------- Co-authored-by: Holger Obermaier <Holger.Obermaier@kit.edu> Co-authored-by: Holger Obermaier <40787752+ho-ob@users.noreply.github.com>
This commit is contained in:
		
							
								
								
									
										56
									
								
								.github/workflows/runonce.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										56
									
								
								.github/workflows/runonce.yml
									
									
									
									
										vendored
									
									
								
							@@ -10,32 +10,6 @@ on:
 | 
			
		||||
 | 
			
		||||
jobs:
 | 
			
		||||
 | 
			
		||||
  #
 | 
			
		||||
  # Job build-1-20
 | 
			
		||||
  # Build on latest Ubuntu using golang version 1.20
 | 
			
		||||
  #
 | 
			
		||||
  build-1-20:
 | 
			
		||||
    runs-on: ubuntu-latest
 | 
			
		||||
    steps:
 | 
			
		||||
    # See: https://github.com/marketplace/actions/checkout
 | 
			
		||||
    # Checkout git repository and submodules
 | 
			
		||||
    - name: Checkout
 | 
			
		||||
      uses: actions/checkout@v4
 | 
			
		||||
      with:
 | 
			
		||||
        submodules: recursive
 | 
			
		||||
 | 
			
		||||
    # See: https://github.com/marketplace/actions/setup-go-environment
 | 
			
		||||
    - name: Setup Golang
 | 
			
		||||
      uses: actions/setup-go@v4
 | 
			
		||||
      with:
 | 
			
		||||
        go-version: '1.20'
 | 
			
		||||
 | 
			
		||||
    - name: Build MetricCollector
 | 
			
		||||
      run: make
 | 
			
		||||
 | 
			
		||||
    - name: Run MetricCollector once
 | 
			
		||||
      run: ./cc-metric-collector --once --config .github/ci-config.json
 | 
			
		||||
 | 
			
		||||
  #
 | 
			
		||||
  # Job build-1-21
 | 
			
		||||
  # Build on latest Ubuntu using golang version 1.21
 | 
			
		||||
@@ -62,6 +36,32 @@ jobs:
 | 
			
		||||
    - name: Run MetricCollector once
 | 
			
		||||
      run: ./cc-metric-collector --once --config .github/ci-config.json
 | 
			
		||||
 | 
			
		||||
  #
 | 
			
		||||
  # Job build-1-22
 | 
			
		||||
  # Build on latest Ubuntu using golang version 1.22
 | 
			
		||||
  #
 | 
			
		||||
  build-1-22:
 | 
			
		||||
    runs-on: ubuntu-latest
 | 
			
		||||
    steps:
 | 
			
		||||
    # See: https://github.com/marketplace/actions/checkout
 | 
			
		||||
    # Checkout git repository and submodules
 | 
			
		||||
    - name: Checkout
 | 
			
		||||
      uses: actions/checkout@v4
 | 
			
		||||
      with:
 | 
			
		||||
        submodules: recursive
 | 
			
		||||
 | 
			
		||||
    # See: https://github.com/marketplace/actions/setup-go-environment
 | 
			
		||||
    - name: Setup Golang
 | 
			
		||||
      uses: actions/setup-go@v4
 | 
			
		||||
      with:
 | 
			
		||||
        go-version: '1.22'
 | 
			
		||||
 | 
			
		||||
    - name: Build MetricCollector
 | 
			
		||||
      run: make
 | 
			
		||||
 | 
			
		||||
    - name: Run MetricCollector once
 | 
			
		||||
      run: ./cc-metric-collector --once --config .github/ci-config.json
 | 
			
		||||
 | 
			
		||||
  #
 | 
			
		||||
  # Build on AlmaLinux 8 using go-toolset
 | 
			
		||||
  #
 | 
			
		||||
@@ -98,6 +98,7 @@ jobs:
 | 
			
		||||
      id: rpmbuild
 | 
			
		||||
      run: |
 | 
			
		||||
          git config --global --add safe.directory /__w/cc-metric-collector/cc-metric-collector
 | 
			
		||||
          export PATH=/usr/local/go/bin:/usr/local/go/pkg/tool/linux_amd64:$PATH
 | 
			
		||||
          make RPM
 | 
			
		||||
 | 
			
		||||
  #
 | 
			
		||||
@@ -133,6 +134,7 @@ jobs:
 | 
			
		||||
      id: rpmbuild
 | 
			
		||||
      run: |
 | 
			
		||||
          git config --global --add safe.directory /__w/cc-metric-collector/cc-metric-collector
 | 
			
		||||
          export PATH=/usr/local/go/bin:/usr/local/go/pkg/tool/linux_amd64:$PATH
 | 
			
		||||
          make RPM
 | 
			
		||||
 | 
			
		||||
  #
 | 
			
		||||
@@ -157,11 +159,13 @@ jobs:
 | 
			
		||||
        submodules: recursive
 | 
			
		||||
        fetch-depth: 0
 | 
			
		||||
    # Use official golang package
 | 
			
		||||
 | 
			
		||||
    # See: https://github.com/marketplace/actions/setup-go-environment
 | 
			
		||||
    - name: Setup Golang
 | 
			
		||||
      uses: actions/setup-go@v4
 | 
			
		||||
      with:
 | 
			
		||||
        go-version: '1.21'
 | 
			
		||||
 | 
			
		||||
    - name: DEB build MetricCollector
 | 
			
		||||
      id: dpkg-build
 | 
			
		||||
      run: |
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user