mirror of
				https://github.com/ClusterCockpit/cc-metric-collector.git
				synced 2025-10-31 17:05:07 +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:
		
							
								
								
									
										22
									
								
								.github/workflows/Release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										22
									
								
								.github/workflows/Release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -44,16 +44,16 @@ jobs: | ||||
|     # Use dnf to install build dependencies | ||||
|     - name: Install build dependencies | ||||
|       run: | | ||||
|           dnf --assumeyes install \ | ||||
|               http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/golang-1.20.6-2.module_el8+658+f14b2092.x86_64.rpm \ | ||||
|               http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/golang-bin-1.20.6-2.module_el8+658+f14b2092.x86_64.rpm \ | ||||
|               http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/golang-src-1.20.6-2.module_el8+658+f14b2092.noarch.rpm \ | ||||
|               http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/go-toolset-1.20.6-1.module_el8+602+8bb8a8d6.x86_64.rpm | ||||
|           wget -q https://go.dev/dl/go1.22.4.linux-amd64.tar.gz --output-document=- | \ | ||||
|           tar --directory=/usr/local --extract --gzip | ||||
|           export PATH=/usr/local/go/bin:/usr/local/go/pkg/tool/linux_amd64:$PATH | ||||
|           go version | ||||
|  | ||||
|     - name: RPM build MetricCollector | ||||
|       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 | ||||
|  | ||||
|     # AlmaLinux 8 is a derivate of RedHat Enterprise Linux 8 (UBI8), | ||||
| @@ -114,16 +114,16 @@ jobs: | ||||
|     # Use dnf to install build dependencies | ||||
|     - name: Install build dependencies | ||||
|       run: | | ||||
|           dnf --assumeyes --disableplugin=subscription-manager install \ | ||||
|               http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/golang-1.20.6-2.module_el8+658+f14b2092.x86_64.rpm \ | ||||
|               http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/golang-bin-1.20.6-2.module_el8+658+f14b2092.x86_64.rpm \ | ||||
|               http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/golang-src-1.20.6-2.module_el8+658+f14b2092.noarch.rpm \ | ||||
|               http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/go-toolset-1.20.6-1.module_el8+602+8bb8a8d6.x86_64.rpm | ||||
|           wget -q https://go.dev/dl/go1.22.4.linux-amd64.tar.gz --output-document=- | \ | ||||
|           tar --directory=/usr/local --extract --gzip | ||||
|           export PATH=/usr/local/go/bin:/usr/local/go/pkg/tool/linux_amd64:$PATH | ||||
|           go version | ||||
|  | ||||
|     - name: RPM build MetricCollector | ||||
|       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 | ||||
|  | ||||
|     # See: https://github.com/actions/upload-artifact | ||||
| @@ -165,7 +165,7 @@ jobs: | ||||
|     # Use official golang package | ||||
|     - name: Install Golang | ||||
|       run: | | ||||
|           wget -q https://go.dev/dl/go1.21.1.linux-amd64.tar.gz --output-document=- | \ | ||||
|           wget -q https://go.dev/dl/go1.22.4.linux-amd64.tar.gz --output-document=- | \ | ||||
|           tar --directory=/usr/local --extract --gzip | ||||
|           export PATH=/usr/local/go/bin:/usr/local/go/pkg/tool/linux_amd64:$PATH | ||||
|           go version | ||||
|   | ||||
		Reference in New Issue
	
	Block a user