mirror of
				https://github.com/ClusterCockpit/cc-metric-collector.git
				synced 2025-11-04 10:45:06 +01:00 
			
		
		
		
	Merge development branch to main (#141)
* Remove go-toolkit as build requirement for RPM builds if run in CI * Remove condition around BuildRequires and use go-toolkit for RPM builds * use go-toolkit for RPM builds * Install go-toolkit to fulfill build requirements for RPM * Add golang-race for UBI9 and Alma9 * Fix wrongly named packages * Fix wrongly named packages * Fix Release part * Fix Release part * Fix documentation of RAPL collector * Mark all JSON config fields of message processor as omitempty * Generate HUGO inputs out of Markdown files * Check creation of CCMessage in NATS receiver * Use CCMessage FromBytes instead of Influx's decoder * Rename 'process_message' to 'process_messages' in metricRouter config This makes the behavior more consistent with the other modules, which have their MessageProcessor named 'process_messages'. This most likely was just a typo. * Add optional interface alias in netstat (#130) * Check creation of CCMessage in NATS receiver * add optional interface aliases for netstatMetric * small fix --------- Co-authored-by: Thomas Roehl <thomas.roehl@fau.de> Co-authored-by: exterr2f <Robert.Externbrink@rub.de> Co-authored-by: Thomas Gruber <Thomas.Roehl@googlemail.com> * Fix excluded metrics for diskstat and add exclude_mounts (#131) * Check creation of CCMessage in NATS receiver * fix excluded metrics and add optional mountpoint exclude --------- Co-authored-by: Thomas Roehl <thomas.roehl@fau.de> Co-authored-by: exterr2f <Robert.Externbrink@rub.de> Co-authored-by: Thomas Gruber <Thomas.Roehl@googlemail.com> * Add derived values for nfsiostat (#132) * Check creation of CCMessage in NATS receiver * add derived_values for nfsiostatMetric --------- Co-authored-by: Thomas Roehl <thomas.roehl@fau.de> Co-authored-by: exterr2f <Robert.Externbrink@rub.de> Co-authored-by: Thomas Gruber <Thomas.Roehl@googlemail.com> * Add exclude_devices to iostat (#133) * Check creation of CCMessage in NATS receiver * add exclude_device for iostatMetric * add md file --------- Co-authored-by: Thomas Roehl <thomas.roehl@fau.de> Co-authored-by: exterr2f <Robert.Externbrink@rub.de> Co-authored-by: Thomas Gruber <Thomas.Roehl@googlemail.com> * Add derived_values for numastats (#134) * Check creation of CCMessage in NATS receiver * add derived_values for numastats * change to ccMessage * remove vim command artefact --------- Co-authored-by: Thomas Roehl <thomas.roehl@fau.de> Co-authored-by: exterr2f <Robert.Externbrink@rub.de> Co-authored-by: Thomas Gruber <Thomas.Roehl@googlemail.com> * Fix artifacts of not done cc-lib switch * Fix artifacts in netstat collector of not done cc-lib switch * Change to cc-lib (#135) * Change to ccMessage from cc-lib * Remove local development path * Use receiver, sinks, ccLogger and ccConfig from cc-lib * Fix ccLogger import path * Update CI * Delete mountpoint when it vanishes, not just its data (#137) --------- Co-authored-by: Michael Panzlaff <michael.panzlaff@fau.de> Co-authored-by: brinkcoder <Robert.Externbrink@ruhr-uni-bochum.de> Co-authored-by: exterr2f <Robert.Externbrink@rub.de>
This commit is contained in:
		
							
								
								
									
										20
									
								
								.github/workflows/Release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										20
									
								
								.github/workflows/Release.yml
									
									
									
									
										vendored
									
									
								
							@@ -73,21 +73,21 @@ jobs:
 | 
			
		||||
        NEW_SRPM=${OLD_SRPM/el8/alma8}
 | 
			
		||||
        mv "${OLD_RPM}" "${NEW_RPM}"
 | 
			
		||||
        mv "${OLD_SRPM}" "${NEW_SRPM}"
 | 
			
		||||
        echo "EL8_SRPM=${NEW_SRPM}" >> $GITHUB_OUTPUT
 | 
			
		||||
        echo "EL8_RPM=${NEW_RPM}" >> $GITHUB_OUTPUT
 | 
			
		||||
        echo "SRPM=${NEW_SRPM}" >> $GITHUB_OUTPUT
 | 
			
		||||
        echo "RPM=${NEW_RPM}" >> $GITHUB_OUTPUT
 | 
			
		||||
 | 
			
		||||
    # See: https://github.com/actions/upload-artifact
 | 
			
		||||
    - name: Save RPM as artifact
 | 
			
		||||
      uses: actions/upload-artifact@v4
 | 
			
		||||
      with:
 | 
			
		||||
        name: cc-metric-collector RPM for AlmaLinux 8
 | 
			
		||||
        path: ${{ steps.rpmrename.outputs.EL8_RPM }}
 | 
			
		||||
        path: ${{ steps.rpmrename.outputs.RPM }}
 | 
			
		||||
        overwrite: true
 | 
			
		||||
    - name: Save SRPM as artifact
 | 
			
		||||
      uses: actions/upload-artifact@v4
 | 
			
		||||
      with:
 | 
			
		||||
        name: cc-metric-collector SRPM for AlmaLinux 8
 | 
			
		||||
        path: ${{ steps.rpmrename.outputs.EL8_SRPM }}
 | 
			
		||||
        path: ${{ steps.rpmrename.outputs.SRPM }}
 | 
			
		||||
        overwrite: true
 | 
			
		||||
 | 
			
		||||
  #
 | 
			
		||||
@@ -152,21 +152,21 @@ jobs:
 | 
			
		||||
        NEW_SRPM=${OLD_SRPM/el9/alma9}
 | 
			
		||||
        mv "${OLD_RPM}" "${NEW_RPM}"
 | 
			
		||||
        mv "${OLD_SRPM}" "${NEW_SRPM}"
 | 
			
		||||
        echo "EL9_SRPM=${NEW_SRPM}" >> $GITHUB_OUTPUT
 | 
			
		||||
        echo "EL9_RPM=${NEW_RPM}" >> $GITHUB_OUTPUT
 | 
			
		||||
        echo "SRPM=${NEW_SRPM}" >> $GITHUB_OUTPUT
 | 
			
		||||
        echo "RPM=${NEW_RPM}" >> $GITHUB_OUTPUT
 | 
			
		||||
 | 
			
		||||
    # See: https://github.com/actions/upload-artifact
 | 
			
		||||
    - name: Save RPM as artifact
 | 
			
		||||
      uses: actions/upload-artifact@v4
 | 
			
		||||
      with:
 | 
			
		||||
        name: cc-metric-collector RPM for AlmaLinux 9
 | 
			
		||||
        path: ${{ steps.rpmrename.outputs.EL9_RPM }}
 | 
			
		||||
        path: ${{ steps.rpmrename.outputs.RPM }}
 | 
			
		||||
        overwrite: true
 | 
			
		||||
    - name: Save SRPM as artifact
 | 
			
		||||
      uses: actions/upload-artifact@v4
 | 
			
		||||
      with:
 | 
			
		||||
        name: cc-metric-collector SRPM for AlmaLinux 9
 | 
			
		||||
        path: ${{ steps.rpmrename.outputs.EL9_SRPM }}
 | 
			
		||||
        path: ${{ steps.rpmrename.outputs.SRPM }}
 | 
			
		||||
        overwrite: true
 | 
			
		||||
 | 
			
		||||
  #
 | 
			
		||||
@@ -235,6 +235,10 @@ jobs:
 | 
			
		||||
    # See: https://catalog.redhat.com/software/containers/ubi8/ubi/5c359854d70cc534b3a3784e?container-tabs=gti
 | 
			
		||||
    container: redhat/ubi9
 | 
			
		||||
    # The job outputs link to the outputs of the 'rpmbuild' step
 | 
			
		||||
    # The job outputs link to the outputs of the 'rpmbuild' step
 | 
			
		||||
    outputs:
 | 
			
		||||
      rpm : ${{steps.rpmbuild.outputs.RPM}}
 | 
			
		||||
      srpm : ${{steps.rpmbuild.outputs.SRPM}}
 | 
			
		||||
    steps:
 | 
			
		||||
 | 
			
		||||
    # Use dnf to install development packages
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user