Skip to content

Commit 5078c70

Browse files
authored
Merge branch 'SkylineCommunications:main' into Partner-Program
2 parents a939f24 + aa3fbd4 commit 5078c70

File tree

412 files changed

+17459
-3200
lines changed

Some content is hidden

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

412 files changed

+17459
-3200
lines changed

.github/workflows/azure-static-web-apps-victorious-sea-0e7978f03.yml

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ jobs:
2222
choco install docfx -y
2323
env:
2424
CI: true
25+
- name: Restore NuGet
26+
run: nuget restore "src/Base Class Library"
2527
- name: build metadata
2628
run: |
2729
docfx metadata -f

CONTRIBUTING.md

+115-2
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@ For larger contributions, e.g. to add several new pages, we recommend that you i
9999

100100
- [Visual Studio Code](https://code.visualstudio.com/) (with the [Learn Authoring Pack](https://marketplace.visualstudio.com/items?itemName=docsmsft.docs-authoring-pack) extension)
101101

102+
> [!NOTE]
103+
> Microsoft also provides a zero-install Visual Studio Code for the web. When you are working in GitHub online, you can access this by pressing the "." button on your keyboard. This version offers a complete overview of the repository like in the downloadable version of Visual Studio Code, but it does not offer any extensions, e.g. a spell check.
104+
102105
When you install GitHub Desktop, you will also need to add the correct repository:
103106

104107
1. Install GitHub Desktop and log in with your GitHub account.
@@ -138,7 +141,7 @@ When you install GitHub Desktop, you will also need to add the correct repositor
138141
139142
For more information on how to work with Visual Studio Code, refer to the [Visual Studio Code documentation](https://code.visualstudio.com/docs). As our documentation is written in Markdown, aside from the general functionality of the application, the [Markdown](https://code.visualstudio.com/docs/languages/markdown) section is of specific interest there.
140143

141-
Also keep in mind that we are using **DocFX Flavored Markdown**. Refer to the [Markdown syntax](#markdown-syntax) section above for more information about this. Make sure the Learn Authoring Pack extension is installed in Visual Studio Code to make it easier to work with this Markdown flavor.
144+
Also keep in mind that we are using **DocFX Flavored Markdown**. Refer to the [Markdown syntax](#markdown-syntax) section below for more information about this. Make sure the Learn Authoring Pack extension is installed in Visual Studio Code to make it easier to work with this Markdown flavor.
142145

143146
### Things to watch out for
144147

@@ -342,7 +345,9 @@ To be able to make a local test build, you need to have DocFX installed. DocFX i
342345
1. Enter `docfx metadata -f` to generate the metadata.
343346

344347
> [!NOTE]
345-
> At this point, you may get 5 warnings mentioning "Found project reference without a matching metadata reference". These can be ignored.
348+
>
349+
> - At this point, you may get 5 warnings mentioning "Found project reference without a matching metadata reference". These can be ignored.
350+
> - At this point, if you get up to 13 warnings, of which 8 mention "Invalid cref value", follow the steps explained [here](#running-docfx-metadata--f-results-in-warnings-mentioning-an-invalid-cref-value).
346351

347352
1. Enter `docfx build -f` to make a test build.
348353

@@ -512,6 +517,17 @@ You can align the pipe characters so that the table also looks like a table in t
512517

513518
If table cells contain a lot of text, it can be next to impossible to keep everything neatly aligned in the Markdown source, so in that case this second syntax may be preferable. Just make sure you use the correct number of pipe characters so that your number of columns is the same in each row, otherwise the table will not be generated correctly.
514519

520+
Also note that you can align table columns by using colons. See the following example:
521+
522+
```md
523+
| Fun | With | Tables |
524+
| :------------------- | -------------------: |:---------------:|
525+
| left-aligned column | right-aligned column | centered column |
526+
| $100 | $100 | $100 |
527+
| $10 | $10 | $10 |
528+
| $1 | $1 | $1 |
529+
```
530+
515531
### Code blocks
516532

517533
To display code examples in separate code blocks, place three backquotes (```) above and below those blocks. In addition, next to the three backquotes above the blocks, specify the type of code, e.g. *csharp*, *md*, *xml*, etc.
@@ -664,6 +680,103 @@ Be careful when you use screenshots of the DataMiner Cube UI, as these can get o
664680

665681
If you do add a screenshot, ideally there should be some indication of the version of the software displayed in the screenshot, so it is clear if the screenshot is outdated.
666682

683+
## Address the reader directly
684+
685+
Avoid writing about your reader as "the user", but instead use "you".
686+
687+
The only time when "the user" is appropriate is when whoever you are writing for will create or configure something for another user, and it is that other user you want to indicate.
688+
689+
**Examples:**
690+
691+
- *You can find more information on DataMiner Dojo.* (Instead of *The user can find more information on DataMiner Dojo.*)
692+
693+
- *When you add a feed component to a dashboard, the user of the dashboard will be able to select a feed.*
694+
695+
## Troubleshooting
696+
697+
### There is a duplicate item in the TOC even though it only occurs once in the toc.yml
698+
699+
**Symptom**: An item shows up twice in the table of contents even though it was only entered once in the *toc.yml*.
700+
701+
**Resolution**: Make sure there is no hyphen in front of the topicUID line. Only the name line should be preceded by a hyphen.
702+
703+
![TOC](~/images/TOC.png)
704+
705+
### Build failed because assembly or file could not be loaded
706+
707+
**Symptom**: When you try to create a test build, this fails with the following error:
708+
709+
```txt
710+
Build failed.
711+
[22-11-04 12:34:56.248]Warning:[ImportPlugins]Skipping file D:\DocFX\plugins_2xobfivj.yks\plugins\System.Memory.dll due to load failure: Could
712+
not load file or assembly 'System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51' or one of its dependencies.
713+
The located assembly's manifest definition does not match the assembly reference.
714+
(Exception from HRESULT: 0x80131040)
715+
```
716+
717+
**Resolution**: Install [the latest version of DocFX](#installing-and-configuring-docfx).
718+
719+
### Build failed because config or content files are missing
720+
721+
**Symptom**: When you try to create a test build, this fails with the following error:
722+
723+
```txt
724+
Build failed.
725+
[22-11-04 12:34:56.248]Error:Either provide config file or specify content files to start building documentation.
726+
O Warning(s)
727+
1 Error(s)
728+
```
729+
730+
**Resolution**: This issue occurs if you try to make a build of only part of the repository. There are specific files in the root of the repository that are needed to be able to start building documentation, so make sure you always create your test builds based on the complete repository.
731+
732+
### Recent changes do not show up in a build
733+
734+
**Symptom**: When you create a test build, it does not include your recent changes.
735+
736+
**Resolution**: Make sure your changes are all saved. If the *Explorer* icon in the top-left corner shows a blue circle with a number in it, there are unsaved changes in a number of files corresponding with that number. The files that contain unsaved changes are marked with a white dot in the file header.
737+
738+
![Unsaved changes](~/images/Unsaved_Changes.png)
739+
740+
### GitHub Desktop keeps basing branches on an outdated version of ‘main’
741+
742+
**Symptom**: Newly created branches indicate that they were created a longer time ago.
743+
744+
**Resolution**:
745+
746+
- Make sure [your fork is up to date](#make-sure-your-fork-is-up-to-date).
747+
748+
- If you installed Git after you installed GitHub Desktop, remove the repository in GitHub Desktop and add it again.
749+
750+
### Running 'docfx metadata -f' results in warnings mentioning an invalid cref value
751+
752+
**Symptom**: When you enter `docfx metadata -f` in the Terminal pane in Visual Studio Code, you get several warnings that look like this:
753+
754+
```txt
755+
[22-12-14 07:59:45.600]Warning:[ExtractMetadata]Invalid cref value "!:JsonReaderException" found in triple-slash-comments for FromJsonString defined in src/Base Class Library/Common/Skyline/DataMiner/Library/Common/Rates/RateHelper.cs Line 309, ignored.
756+
[22-12-14 07:59:45.600]Warning:[ExtractMetadata]Invalid cref value "!:JsonReaderException" found in triple-slash-comments for FromJsonString defined in src/Base Class Library/Common/Skyline/DataMiner/Library/Common/Rates/RateHelper.cs Line 354, ignored.
757+
```
758+
759+
**Resolution**:
760+
761+
1. Open Visual Studio.
762+
763+
1. Select to open a project or solution and open *C:\...\GitHub\dataminer-docs\src\Base Class Library\Code Library.sln*.
764+
765+
1. In the *Solution Explorer* pane, right-click *Solution 'Code Library'* and select *Restore NuGet packages*.
766+
767+
You will get the following output:
768+
769+
```txt
770+
`Restored C:\...\GitHub\dataminer-docs\src\Base Class Library\Common\Common.csproj (in 340 ms).
771+
NuGet package restore finished
772+
Time Elapsed: 00:00:00.7119526
773+
========== Finished ==========
774+
```
775+
776+
1. Enter `docfx metadata -f` in Visual Studio Code again.
777+
778+
You should now get no more than 5 warnings when generating the metadata.
779+
667780
## References
668781

669782
As our way of working is very similar to the approach used for Microsoft Docs, it can be useful to take a look at the [Microsoft Docs Contributor Guide](https://docs.microsoft.com/en-us/contribute/) for additional information and guidelines.

README.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
![CI/CD](https://github.com/SkylineCommunications/dataminer-docs/actions/workflows/azure-static-web-apps-victorious-sea-0e7978f03.yml/badge.svg)
2+
13
# dataminer-docs
24

35
Open-source documentation of DataMiner.
Loading
112 KB
Loading

dataminer-overview/FAQ/FAQ_DCP.md

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
uid: FAQ_DCP
3+
---
4+
5+
# Questions related to DataMiner Cloud Services
6+
7+
### How is security handled by the Cloud Platform Services?
8+
9+
See [Cloud connectivity and security](xref:Cloud_connectivity_and_security).
10+
11+
### How do I connect a DMS to the cloud? What are the prerequisites?
12+
13+
See [Connecting your DataMiner System to the cloud](xref:Connecting_your_DataMiner_System_to_the_cloud).
14+
15+
### Do all Agents in a DMS have to be connected to the cloud?
16+
17+
No, this is only required for a single Agent within a private DataMiner System. However, there are a couple of advantages to connecting more than one Agent:
18+
19+
- **Redundancy**: The Cloud Gateway nodes run independently from each other. Each one of them will maintain a tunnel connection to the DataMiner Cloud Platform. This means that when the connection is lost for one DMA, you will still be cloud-connected through the other Cloud Gateway nodes.
20+
21+
- **Load balancing**: Every time you open a shared dashboard or relay to your DMS, a random Cloud Gateway node is chosen to process your session. This means that the opening of multiple shares is distributed over the various Cloud Gateways. As a Cloud Gateway always forwards the traffic to the same web API service, this also distributes the load across different web API services in the cluster.
22+
23+
> [!NOTE]
24+
> At this time, we recommend running 1 to 3 Cloud Gateway nodes in a cluster. Running more Cloud Gateway nodes than that in a cluster would only add an unnecessary extra load on the DataMiner Cloud Platform.
25+
26+
### How does the live sharing work, and how is it secured?
27+
28+
Users can share a dashboard by clicking *Share* or *Start sharing* at the top of the dashboard. For more details, see [Sharing a dashboard](xref:Sharing_a_dashboard).
29+
30+
The sharing recipients will receive a link via email on the email address specified by the share creator. When they open the link, the recipients will be asked to authenticate as the rightful owner of the email address by logging in to an account from the DataMiner Cloud Platform, Microsoft, Google, LinkedIn, or Amazon linked to that email address, or by creating a dedicated DataMiner Cloud Platform account if they do not have any of the formerly mentioned accounts. After successfully authenticating, the recipient will be directed to the dashboard through the DataMiner Cloud Platform tunnel.
31+
32+
No data from the private DataMiner System hosting the dashboard is stored on the DataMiner Cloud Platform. The share can be deleted in the same way as it was created. All emailed links will then automatically become unreachable.

dataminer-overview/FAQ/FAQs_Pricing.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
uid: FAQs_Pricing
33
---
44

5-
# Questions related to pricing of usage-based services
5+
# Questions related to commercial models
66

77
- **Can different commercial models exist in the same organization?**
88

dataminer-overview/Overview_index.md

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ We are working on adding more information to this section soon, so check back fo
1313
- [DataMiner Cloud Platform](xref:Overview_DCP)
1414
- [Agile partnership](xref:Overview_Agile_Partnership_intro)
1515
- [Training courses and certification](xref:Overview_Training_intro)
16+
- [Pricing](xref:Pricing)
1617
- [Support Services](xref:Overview_Support_DMS_M_and_S)
1718
- [Compliance statements](xref:Overview_Compliance_Statements_intro)
1819
- [Partner Program](xref:Partner_Program)

dataminer-overview/Pricing/Pricing.md

+3-30
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,9 @@ uid: Pricing
66

77
DataMiner open monitoring and orchestration software is a transformational platform offering a broad range of modular functions with an unlimited number of applications. Depending on where you find yourself on your digital transformation journey, on what your business models and strategy are, and on how you intend to use the platform, you may be looking for different commercial and delivery models. Skyline can offer you maximum choice and flexibility to perfectly align with your priorities.
88

9-
DataMiner can be used with **Perpetual-Use Licenses** or with two flavors of usage-based service models, namely the **Subscription Plan** and the **Pay-per-Use Plan**.
10-
11-
For the usage-based models, pricing is available for both self-hosted (on-premises or in a private cloud) and Skyline-hosted (referred to as *DataMiner as a Service*) systems.
9+
- [Commercial models summary](xref:Pricing_Commercial_Models)
10+
- [Usage-based services](xref:Pricing_Usage_based_service)
11+
- [Perpetual-Use Licensing](xref:Pricing_Perpetual_Use_Licensing)
1212

1313
> [!TIP]
1414
> See also: [Questions related to pricing of usage-based services](xref:FAQs_Pricing)
15-
16-
## Perpetual-Use Licenses
17-
18-
Perpetual-Use Licensing is based on the proven and flexible DataMiner Licensing Scheme, which has been available for several years. Licenses are available for **DataMiner nodes** (which are available in different capacity tiers to manage a set number of Managed Objects), for **optional features**, and for **connectors** that interface DataMiner with different third-party products (the latter irrespective of the total number of elements managed with the connector, and with a fixed price regardless of whether the connector exists or still needs to be developed).
19-
20-
Perpetual-Use Licenses are a one-off expenditure.
21-
22-
> [!NOTE]
23-
> Perpetual-Use License deployments are typically further complemented by the optional [DataMiner Support Services](xref:Overview_Support_DMS_M_and_S), which provide both technical support as well as unlimited access to all available DataMiner software upgrades and updates. For Perpetual-Use Licenses, the cost for DataMiner Support Services is an annual recurring fee, relative to the value of the deployed Perpetual-Use Licenses.
24-
25-
> [!TIP]
26-
> See also: [DataMiner Perpetual-Use Licenses vs Usage-based services](xref:Pricing_PerpetualUseLicenses_vs_UsageBasedServices)
27-
28-
## Usage-based services
29-
30-
> [!TIP]
31-
> See also: [Usage-based services](xref:Pricing_Usage_based_service)
32-
33-
### Subscription Plan
34-
35-
DataMiner Subscription Plan is a yearly subscription built around a flexible, simple and transparent software utilization offering whereby a **Monthly Utilization Allowance (MUA)** is available for the operational teams to leverage DataMiner and to evolve it easily and continuously as dictated by their momentary needs, in terms of scale, in terms of utilization of its wealth of modular functions, and in terms of interfacing with third-party products.
36-
37-
The Subscription Plan offering results in a well-defined and controlled expenditure, combined with maximum freedom for the operational teams to leverage any of the many capabilities of DataMiner without any limitation, in any way deemed of value for the operation.
38-
39-
### Pay-per-Use
40-
41-
DataMiner Pay-per-Use is the most flexible model, very similar to the Subscription Service, but with no fixed Monthly Utilization Allowance nor annual contract or commitments. DataMiner usage is simply metered on a monthly basis and deducted from the defined allowance.

0 commit comments

Comments
 (0)