mirror of
https://github.com/ClusterCockpit/cc-metric-collector.git
synced 2025-07-20 20:01:40 +02:00
Compare commits
2 Commits
likwidMetr
...
v0.7.0
Author | SHA1 | Date | |
---|---|---|---|
|
ee4e1baf5b | ||
|
94c80307e8 |
20
.github/workflows/Release.yml
vendored
20
.github/workflows/Release.yml
vendored
@@ -73,21 +73,21 @@ jobs:
|
|||||||
NEW_SRPM=${OLD_SRPM/el8/alma8}
|
NEW_SRPM=${OLD_SRPM/el8/alma8}
|
||||||
mv "${OLD_RPM}" "${NEW_RPM}"
|
mv "${OLD_RPM}" "${NEW_RPM}"
|
||||||
mv "${OLD_SRPM}" "${NEW_SRPM}"
|
mv "${OLD_SRPM}" "${NEW_SRPM}"
|
||||||
echo "EL8_SRPM=${NEW_SRPM}" >> $GITHUB_OUTPUT
|
echo "SRPM=${NEW_SRPM}" >> $GITHUB_OUTPUT
|
||||||
echo "EL8_RPM=${NEW_RPM}" >> $GITHUB_OUTPUT
|
echo "RPM=${NEW_RPM}" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
# See: https://github.com/actions/upload-artifact
|
# See: https://github.com/actions/upload-artifact
|
||||||
- name: Save RPM as artifact
|
- name: Save RPM as artifact
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: cc-metric-collector RPM for AlmaLinux 8
|
name: cc-metric-collector RPM for AlmaLinux 8
|
||||||
path: ${{ steps.rpmrename.outputs.EL8_RPM }}
|
path: ${{ steps.rpmrename.outputs.RPM }}
|
||||||
overwrite: true
|
overwrite: true
|
||||||
- name: Save SRPM as artifact
|
- name: Save SRPM as artifact
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: cc-metric-collector SRPM for AlmaLinux 8
|
name: cc-metric-collector SRPM for AlmaLinux 8
|
||||||
path: ${{ steps.rpmrename.outputs.EL8_SRPM }}
|
path: ${{ steps.rpmrename.outputs.SRPM }}
|
||||||
overwrite: true
|
overwrite: true
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -152,21 +152,21 @@ jobs:
|
|||||||
NEW_SRPM=${OLD_SRPM/el9/alma9}
|
NEW_SRPM=${OLD_SRPM/el9/alma9}
|
||||||
mv "${OLD_RPM}" "${NEW_RPM}"
|
mv "${OLD_RPM}" "${NEW_RPM}"
|
||||||
mv "${OLD_SRPM}" "${NEW_SRPM}"
|
mv "${OLD_SRPM}" "${NEW_SRPM}"
|
||||||
echo "EL9_SRPM=${NEW_SRPM}" >> $GITHUB_OUTPUT
|
echo "SRPM=${NEW_SRPM}" >> $GITHUB_OUTPUT
|
||||||
echo "EL9_RPM=${NEW_RPM}" >> $GITHUB_OUTPUT
|
echo "RPM=${NEW_RPM}" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
# See: https://github.com/actions/upload-artifact
|
# See: https://github.com/actions/upload-artifact
|
||||||
- name: Save RPM as artifact
|
- name: Save RPM as artifact
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: cc-metric-collector RPM for AlmaLinux 9
|
name: cc-metric-collector RPM for AlmaLinux 9
|
||||||
path: ${{ steps.rpmrename.outputs.EL9_RPM }}
|
path: ${{ steps.rpmrename.outputs.RPM }}
|
||||||
overwrite: true
|
overwrite: true
|
||||||
- name: Save SRPM as artifact
|
- name: Save SRPM as artifact
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: cc-metric-collector SRPM for AlmaLinux 9
|
name: cc-metric-collector SRPM for AlmaLinux 9
|
||||||
path: ${{ steps.rpmrename.outputs.EL9_SRPM }}
|
path: ${{ steps.rpmrename.outputs.SRPM }}
|
||||||
overwrite: true
|
overwrite: true
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -235,6 +235,10 @@ jobs:
|
|||||||
# See: https://catalog.redhat.com/software/containers/ubi8/ubi/5c359854d70cc534b3a3784e?container-tabs=gti
|
# See: https://catalog.redhat.com/software/containers/ubi8/ubi/5c359854d70cc534b3a3784e?container-tabs=gti
|
||||||
container: redhat/ubi9
|
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
|
||||||
|
# The job outputs link to the outputs of the 'rpmbuild' step
|
||||||
|
outputs:
|
||||||
|
rpm : ${{steps.rpmbuild.outputs.RPM}}
|
||||||
|
srpm : ${{steps.rpmbuild.outputs.SRPM}}
|
||||||
steps:
|
steps:
|
||||||
|
|
||||||
# Use dnf to install development packages
|
# Use dnf to install development packages
|
||||||
|
@@ -33,10 +33,8 @@ In contrast to the configuration files for sinks and receivers, the collectors c
|
|||||||
* [`topprocs`](./topprocsMetric.md)
|
* [`topprocs`](./topprocsMetric.md)
|
||||||
* [`nfs3stat`](./nfs3Metric.md)
|
* [`nfs3stat`](./nfs3Metric.md)
|
||||||
* [`nfs4stat`](./nfs4Metric.md)
|
* [`nfs4stat`](./nfs4Metric.md)
|
||||||
* [`nfsiostat`](./nfsiostatMetric.md)
|
|
||||||
* [`cpufreq`](./cpufreqMetric.md)
|
* [`cpufreq`](./cpufreqMetric.md)
|
||||||
* [`cpufreq_cpuinfo`](./cpufreqCpuinfoMetric.md)
|
* [`cpufreq_cpuinfo`](./cpufreqCpuinfoMetric.md)
|
||||||
* [`schedstat`](./schedstatMetric.md)
|
|
||||||
* [`numastats`](./numastatsMetric.md)
|
* [`numastats`](./numastatsMetric.md)
|
||||||
* [`gpfs`](./gpfsMetric.md)
|
* [`gpfs`](./gpfsMetric.md)
|
||||||
* [`beegfs_meta`](./beegfsmetaMetric.md)
|
* [`beegfs_meta`](./beegfsmetaMetric.md)
|
||||||
|
@@ -190,8 +190,12 @@ func getBaseFreq() float64 {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if math.IsNaN(freq) {
|
if math.IsNaN(freq) {
|
||||||
C.timer_init()
|
C.power_init(0)
|
||||||
freq = float64(C.timer_getCycleClock()) / 1e3
|
info := C.get_powerInfo()
|
||||||
|
if float64(info.baseFrequency) != 0 {
|
||||||
|
freq = float64(info.baseFrequency)
|
||||||
|
}
|
||||||
|
C.power_finalize()
|
||||||
}
|
}
|
||||||
return freq * 1e3
|
return freq * 1e3
|
||||||
}
|
}
|
||||||
|
@@ -91,18 +91,17 @@ func (r *NatsReceiver) _NatsReceive(m *nats.Msg) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
y, err := lp.NewMessage(
|
y, _ := lp.NewMessage(
|
||||||
string(measurement),
|
string(measurement),
|
||||||
tags,
|
tags,
|
||||||
nil,
|
nil,
|
||||||
fields,
|
fields,
|
||||||
t,
|
t,
|
||||||
)
|
)
|
||||||
if err == nil {
|
|
||||||
m, err := r.mp.ProcessMessage(y)
|
m, err := r.mp.ProcessMessage(y)
|
||||||
if err == nil && m != nil && r.sink != nil {
|
if err == nil && m != nil {
|
||||||
r.sink <- m
|
r.sink <- m
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user