Skip to content

Commit 9520f48

Browse files
Merge branch 'next'
2 parents ea54e3b + 91abd5f commit 9520f48

File tree

103 files changed

+497
-345
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+497
-345
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,20 @@
11
<!--- Verify first that your issue/request is not already reported in GitHub -->
22

33
##### SUMMARY
4-
<!--- Explain the problem briefly here, details go way below -->
4+
<!--- Explain the problem briefly here, details go below -->
55

66
##### ISSUE TYPE
77
<!--- Pick one below and delete the rest: -->
88
- Bug Report
99
- Feature Idea
1010
- Documentation Report
1111

12-
##### DSTAT VERSION
13-
```
14-
<!--- Paste verbatim output from “dstat --version” here between tripple quotes -->
15-
```
16-
17-
<!---
18-
Test your issue using the latest release AND using the master branch code.
19-
Download the latest release and the master branch from:
20-
21-
https://github.com/dagwieers/dstat/releases
22-
https://github.com/dagwieers/dstat/archive/master.tar.gz
23-
24-
You can run dstat directly from the source tree using: ./dstat
25-
Mention below which versions work correctly, or when it started to fail.
26-
-->
12+
##### DOOL VERSION
13+
<!--- Paste Dool version here -->
2714

2815
##### OS / ENVIRONMENT
2916
<!---
30-
Mention the OS you are running Dstat from, and anything platform-specific
17+
What the OS you are running Dool on, and anything platform-specific
3118
that could be related to your issue.
3219
-->
3320

@@ -37,18 +24,8 @@ For bugs, show exactly how to reproduce the problem.
3724
For new features, show how the feature would be used.
3825
-->
3926

40-
```
41-
<!--- Paste example use or output here between quotes -->
42-
```
43-
44-
<!--- You can also paste gist.github.com links for larger files -->
45-
4627
##### EXPECTED RESULTS
4728
<!--- What did you expect to happen when running the steps above? -->
4829

4930
##### ACTUAL RESULTS
50-
<!--- What actually happened? Try running with debug enabled "dstat --debug" -->
51-
52-
```
53-
<!--- Paste verbatim command output between quotes -->
54-
```
31+
<!--- What actually happened? Try running with debug enabled "dool --debug" -->

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
1-
##### ISSUE TYPE
2-
<!--- Pick one below and delete the rest: -->
3-
- New plugin pull-request
4-
- Feature pull-request
5-
- Bugfix pull-request
6-
- Docs pull-request
7-
8-
##### DSTAT VERSION
9-
```
10-
<!--- Paste verbatim output from “dstat --version” here -->
11-
```
1+
##### DOOL VERSION
2+
<!--- Paste Dool version here -->
123

134
##### SUMMARY
145
<!--- Describe the change here, including rationale and design decisions -->

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ Light mode
4141

4242
Dool ships with many plug-ins to configure the output to your taste.
4343

44-
dool --cpu --net --time --full 15 # Show CPU usage, and each network interface
45-
dool --disk --memory 5 # Show disk totals, and memory consumption
46-
dool --cpu --load --swap --time 60 # Show CPU, load, and swap
44+
dool --cpu --net --time --full # Show CPU usage, and each network interface
45+
dool --disk -D total,sda,sdd # Show the total disk IO, and /dev/sda and /dev/sdd
46+
dool --net -N eth0,eth1 # Show the network traffic for eth0 and eth1
4747

4848
A list of available plug-ins are available if you run `dool --version`
4949

docs/dool.1

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,16 @@ force integer values on screen (mutual exclusive with
279279
\fB\-\-float\fR)
280280
.RE
281281
.PP
282+
\-\-color
283+
.RS 4
284+
force 256 color output (default)
285+
.RE
286+
.PP
287+
\-\-color16
288+
.RS 4
289+
force 16 color
290+
.RE
291+
.PP
282292
\-\-bw, \-\-blackonwhite
283293
.RS 4
284294
change colors for white background terminal

docs/dool.1.adoc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,12 @@ Possible internal stats are::
170170
--integer::
171171
force integer values on screen (mutual exclusive with *--float*)
172172

173+
--color::
174+
force 256 color output (default)
175+
176+
--color16::
177+
force 16 color
178+
173179
--bw, --blackonwhite::
174180
change colors for white background terminal
175181

docs/dool.1.html

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1134,6 +1134,22 @@ <h2 id="_options">OPTIONS</h2>
11341134
</p>
11351135
</dd>
11361136
<dt class="hdlist1">
1137+
--color
1138+
</dt>
1139+
<dd>
1140+
<p>
1141+
force 256 color output (default)
1142+
</p>
1143+
</dd>
1144+
<dt class="hdlist1">
1145+
--color16
1146+
</dt>
1147+
<dd>
1148+
<p>
1149+
force 16 color
1150+
</p>
1151+
</dd>
1152+
<dt class="hdlist1">
11371153
--bw, --blackonwhite
11381154
</dt>
11391155
<dd>
@@ -2099,7 +2115,7 @@ <h2 id="_author">AUTHOR</h2>
20992115
<div id="footer-text">
21002116
Version 1.1.0<br />
21012117
Last updated
2102-
2023-06-05 14:47:19 PDT
2118+
2023-06-19 08:30:10 PDT
21032119
</div>
21042120
</div>
21052121
</body>

0 commit comments

Comments
 (0)