Permalink
Browse files

ignores, new README, fixing bits and pieces

  • Loading branch information...
1 parent b2b8c91 commit bba264408eb2aeb5faef0de2ade92779d0e06e23 @agroszer agroszer committed with steveschnepp Jun 21, 2012
Showing with 196 additions and 50 deletions.
  1. +4 −0 .gitignore
  2. +147 −0 README.rst
  3. +2 −0 bin/.gitignore
  4. +1 −0 installer/.gitignore
  5. +1 −1 installer/munin-node-win32.nsi
  6. +7 −7 munin-node.sln
  7. +34 −42 munin-node.vcproj
View
@@ -0,0 +1,4 @@
+*.bak
+*.ncb
+*.suo
+munin-node.vcproj.*
View
@@ -0,0 +1,147 @@
+============================
+Munin Node for Windows
+============================
+
+Introduction
+------------
+Munin Node for Windows AKA munin-node-win32, is a Windows client for the Munin monitoring system.
+
+It is written in C++ with most plugins built into the executable. Which is different from the standard munin-node client, which only uses external plugins written as shell and Perl scripts.
+
+Command Line Usage
+------------------
+
+ * -install Install as a system service.
+ * -uninstall Removes the installed service.
+ * -quiet Close the console window, running in the background.
+ * -run Run as a normal program, rather than a service.
+
+Configuration File
+------------------
+
+The configuration file munin-node.ini uses the standard INI file format.
+
+The main section is the Plugins section which defines which plugins are enabled and which are disabled. Use 1 to enable and 0 to disable. Most plugins handle failing to load gracefully, however some may have a bug (if so please report :).
+
+You can disable plugins you don't want, to save on memory and cpu usage.
+
+Plugins
+-------
+
+ * CPU (cpu):
+
+ * Reports the current user cpu usage
+
+ * Disk (df):
+
+ * Reports disk drive space usage
+
+ * Configuration in DiskPlugin section.
+
+ * HD (hdd):
+
+ * Reports HardDrive temperature
+
+ * Memory (memory):
+
+ * Reports memory usage
+
+ * Process (processes):
+
+ * Reports process and thread count
+
+ * Network (network):
+
+ * Reports network bytes send and received
+
+ * MBM (mbm, mbm_volt, mbm_fan, mbm_cpu):
+
+ * Reports sensor data from Motherboard Monitor
+
+ * SpeedFan (speedfan):
+
+ * Reports sensor data from SpeedFan xAP broadcasts
+
+ * Configuration in SpeedFanPlugin section. You have to change the BroadcastIP and UID settings to match SpeedFan (Configuration->xAP)
+
+ * Performance Counter:
+
+ * Reports performance counter values, very extenable to monitor any counter
+
+ * An instance of this plugin is created for every section starting with PerfCounterPlugin in the Configuration. For example there is a PerfCounterPlugin_uptime section in the stock configuration file. This defines a plugin with a name of uptime.
+
+ * An example section is listed below ::
+
+ ; The Object and Counter settings are used to access the Performance Counter
+ ; For uptime this would result in \System\System Up Time
+ Object=System
+ Counter=System Up Time
+ ; The Graph settings are reported to munin
+ GraphTitle=Uptime
+ GraphCategory=system
+ GraphDraw=AREA
+ GraphArgs=--base 1000 -l 0
+ ; The DropTotal setting will drop the last instance from the counter list,
+ ; which is often _Total
+ ; Has no effect on single instance counters (Uptime)
+ DropTotal=0
+ ; The CounterFormat setting controls what format the counter value is read in as
+ ; a double, int, or large (int64).
+ ; The plugin always outputs doubles, so this shouldn't have that much effect
+ CounterFormat=large
+ ; The CounterMultiply setting sets a value the counter value is multiplied by,
+ ; use it to adjust the scale
+ ; 1.1574074074074073e-005 is the result of(1 / 86400.0),
+ ; the uptime counter reports seconds and we want to report days.
+ ; So we want to divide the counter value by the number of seconds in a day, 86400.
+ CounterMultiply=1.1574074074074073e-005
+
+ * External Plugin:
+
+ * A plugin that supports external plugins in the style of munin-node.
+
+ * Configuration in [ExternalPlugin] section. Just add an entry with the path to the program to run, It doesn't matter what the name of the name=value pair is.
+
+ * The output of the external program should be similar to the following,
+
+ * Note: add quotes (") around the value if it has spaces! ::
+
+ >disk_free.py name
+ drive_free
+
+ >disk_free.py
+ drive_free_c.value 40.3635149113
+ .
+
+ >disk_free.py config
+ graph_title Filesystem free (in %)
+ graph_category disk
+ graph_info This graph shows the amount of free space on each disk.
+ graph_args --upper-limit 100 -l 0
+ graph_vlabel %
+ drive_free_c.label C:
+ .
+
+Version History
+---------------
+See ChangeLog
+
+
+Building a release
+------------------
+
+Using MS Visual C++ 2008 Express Edition
+
+Bump version in `munin-node.rc` and `installer\munin-node-win32.nsi`
+
+Open `munin-node.sln`
+
+Select `Release` and `win32` build options
+
+Then `Build` / `Rebuild solution`
+
+That creates the `bin\Release\munin-node.exe` file
+
+Get the `NSIS (Nullsoft Scriptable Install System)` (2.46)
+
+Compile `installer\munin-node-win32.nsi` with NSIS
View
@@ -0,0 +1,2 @@
+Release
+Debug
View
@@ -0,0 +1 @@
+*.exe
@@ -53,7 +53,7 @@ Section "Munin Node for Windows (required)"
SetOutPath $INSTDIR
; Put file there
- File "..\Release\munin-node.exe"
+ File "..\bin\Release\munin-node.exe"
File "..\munin-node.ini"
; Write the installation path into the registry
View
@@ -1,18 +1,18 @@

-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "munin-node", "munin-node.vcxproj", "{8AB26E5C-9C20-1782-4F7C-06B5691F12E2}"
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual C++ Express 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "munin-node", "munin-node.vcproj", "{607B3825-C2B1-4BB3-B9B4-CE2BCF704E05}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {8AB26E5C-9C20-1782-4F7C-06B5691F12E2}.Debug|Win32.ActiveCfg = Debug|Win32
- {8AB26E5C-9C20-1782-4F7C-06B5691F12E2}.Debug|Win32.Build.0 = Debug|Win32
- {8AB26E5C-9C20-1782-4F7C-06B5691F12E2}.Release|Win32.ActiveCfg = Release|Win32
- {8AB26E5C-9C20-1782-4F7C-06B5691F12E2}.Release|Win32.Build.0 = Release|Win32
+ {607B3825-C2B1-4BB3-B9B4-CE2BCF704E05}.Debug|Win32.ActiveCfg = Debug|Win32
+ {607B3825-C2B1-4BB3-B9B4-CE2BCF704E05}.Debug|Win32.Build.0 = Debug|Win32
+ {607B3825-C2B1-4BB3-B9B4-CE2BCF704E05}.Release|Win32.ActiveCfg = Release|Win32
+ {607B3825-C2B1-4BB3-B9B4-CE2BCF704E05}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
View
@@ -101,19 +101,23 @@
/>
</Configuration>
<Configuration
- Name="Debug|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ Name="Release|Win32"
+ OutputDirectory="bin/Release"
+ IntermediateDirectory="bin/Release"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
+ WholeProgramOptimization="0"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine=""
/>
<Tool
Name="VCCustomBuildTool"
+ CommandLine=""
+ AdditionalDependencies=""
+ Outputs=""
/>
<Tool
Name="VCXMLDataGeneratorTool"
@@ -123,16 +127,15 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="2"
AdditionalIncludeDirectories=".;src/"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x500;_CRT_SECURE_NO_WARNINGS"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x500;_CRT_SECURE_NO_WARNINGS"
+ StringPooling="true"
+ ExceptionHandling="1"
+ RuntimeLibrary="2"
UsePrecompiledHeader="2"
WarningLevel="3"
DebugInformationFormat="3"
@@ -150,15 +153,16 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib Iphlpapi.lib Pdh.lib msi.lib"
OutputFile="$(OutDir)/munin-node.exe"
- LinkIncremental="2"
+ LinkIncremental="1"
AdditionalLibraryDirectories=""
DelayLoadDLLs=""
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/munin-node.pdb"
+ GenerateMapFile="true"
+ MapFileName="$(OutDir)/$(ProjectName).map"
SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="17"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -183,23 +187,19 @@
/>
</Configuration>
<Configuration
- Name="Release|Win32"
- OutputDirectory="bin/Release"
- IntermediateDirectory="bin/Release"
+ Name="Debug|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
- WholeProgramOptimization="0"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine=""
/>
<Tool
Name="VCCustomBuildTool"
- CommandLine=""
- AdditionalDependencies=""
- Outputs=""
/>
<Tool
Name="VCXMLDataGeneratorTool"
@@ -209,15 +209,16 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
+ Optimization="0"
AdditionalIncludeDirectories=".;src/"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x500;_CRT_SECURE_NO_WARNINGS"
- StringPooling="true"
- ExceptionHandling="1"
- RuntimeLibrary="2"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x500;_CRT_SECURE_NO_WARNINGS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="3"
DebugInformationFormat="3"
@@ -235,16 +236,15 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib Iphlpapi.lib Pdh.lib msi.lib"
OutputFile="$(OutDir)/munin-node.exe"
- LinkIncremental="1"
+ LinkIncremental="2"
AdditionalLibraryDirectories=""
DelayLoadDLLs=""
GenerateDebugInformation="true"
- GenerateMapFile="true"
- MapFileName="$(OutDir)/$(ProjectName).map"
+ ProgramDatabaseFile="$(OutDir)/munin-node.pdb"
SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -507,14 +507,6 @@
Name="extra"
>
<File
- RelativePath=".\src\extra\FirewallInstallHelper.cpp"
- >
- </File>
- <File
- RelativePath=".\src\extra\FirewallInstallHelper.h"
- >
- </File>
- <File
RelativePath=".\src\extra\iniFile.cpp"
>
</File>
@@ -644,15 +636,15 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"

0 comments on commit bba2644

Please sign in to comment.