Skip to content

Commit

Permalink
Update some examples before new release
Browse files Browse the repository at this point in the history
  • Loading branch information
f18m committed Nov 15, 2024
1 parent d8c8765 commit 799cdd7
Show file tree
Hide file tree
Showing 8 changed files with 549 additions and 224 deletions.
12 changes: 11 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ all:
if [ -d "collector" ]; then $(MAKE) -C collector CMONITOR_VERSION=$(CMONITOR_VERSION) CMONITOR_RELEASE=$(CMONITOR_RELEASE) CMONITOR_LAST_COMMIT_HASH=$(CMONITOR_LAST_COMMIT_HASH) DOCKER_TAG=$(DOCKER_TAG) PROMETHEUS_SUPPORT=$(PROMETHEUS_SUPPORT) ; fi
if [ -d "tools" ]; then $(MAKE) -C tools CMONITOR_VERSION=$(CMONITOR_VERSION) CMONITOR_RELEASE=$(CMONITOR_RELEASE) CMONITOR_LAST_COMMIT_HASH=$(CMONITOR_LAST_COMMIT_HASH) ; fi

conan_install:
conan install . --build=missing

centos_install_prereq:
# this is just the list present in "BuildRequires" field of the RPM spec file:
yum install gcc-c++ make gtest-devel fmt-devel git
Expand Down Expand Up @@ -61,6 +64,13 @@ endif

valgrind:
$(MAKE) -C collector valgrind



#
# DOCKER IMAGE
#

cmonitor_musl:
$(MAKE) -C collector cmonitor_musl
docker_image:
Expand Down Expand Up @@ -104,7 +114,7 @@ endif
dpkg-buildpackage --post-clean --build=source --force-sign # build source only otherwise Ubuntu PPA rejects with "Source/binary (i.e. mixed) uploads are not allowed"
debsign -S # you must have the GPG key setup properly for this to work (see e.g. https://help.github.com/en/articles/generating-a-new-gpg-key)
@echo "When ready to upload to your PPA run dput as e.g.:"
@echo " cd .. && dput ppa:francesco-montorsi/cmonitor cmonitor_$(CMONITOR_VERSION).$(CMONITOR_RELEASE)-1ubuntu1_source.changes"
@echo " cd .. && dput ppa:francesco-montorsi/cmonitor cmonitor_$(CMONITOR_VERSION)*_source.changes"

deb_local_test:
ifeq ($(shell whoami),root)
Expand Down
701 changes: 508 additions & 193 deletions examples/baremetal1.html

Large diffs are not rendered by default.

Binary file modified examples/baremetal1.json.gz
Binary file not shown.
20 changes: 10 additions & 10 deletions examples/docker-collecting-baremetal-stats.html

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions examples/docker-collecting-docker-stats.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/docker-stress-test-cpu.html
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ <h3>Monitoring Summary</h3>
</ul></td><td><ul>
<li>Total time sampled (hh:mm:ss): <span class='bottom_table_val'>0:00:15</span></li>
<li>Version (cmonitor_collector): <span class='bottom_table_val'>2.3.1-0</span></li>
<li>Version (cmonitor_chart): <span class='bottom_table_val'>2.3.1-0</span></li>
<li>Version (cmonitor_chart): <span class='bottom_table_val'>2.5.0-0</span></li>
</ul></td></tr>
</table>
</div>
Expand Down
2 changes: 1 addition & 1 deletion examples/docker-stress-test-mem.html
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,7 @@ <h3>Monitoring Summary</h3>
</ul></td><td><ul>
<li>Total time sampled (hh:mm:ss): <span class='bottom_table_val'>0:00:15</span></li>
<li>Version (cmonitor_collector): <span class='bottom_table_val'>2.3.1-0</span></li>
<li>Version (cmonitor_chart): <span class='bottom_table_val'>2.3.1-0</span></li>
<li>Version (cmonitor_chart): <span class='bottom_table_val'>2.5.0-0</span></li>
</ul></td></tr>
</table>
</div>
Expand Down
22 changes: 11 additions & 11 deletions examples/docker-userapp.html

Large diffs are not rendered by default.

0 comments on commit 799cdd7

Please sign in to comment.